Merge branch 'feat/goodsEdit-boxNum' of 47.94.45.65:angelo/web-retail-admin into dev

src/views/goodsManage/goodsList/goodsEdit/jcsz.vue

@@ -333,15 +333,16 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col v-show="form.specialArea == 3" :span="8">
+              <el-col :span="8">
-                <el-form-item label="发起人收益">
+                <el-form-item label="上传盒数" prop="boxNum">
                   <el-input
-                    v-model="form.makerIncome"
+                    v-model="form.boxNum"
                     clearable
                     :placeholder="'请输入'"
                   />
                 </el-form-item>
               </el-col>
+
               <el-col :span="24">
                 <el-form-item :label="'保证标签'">
                   <el-checkbox-group
@@ -853,6 +854,7 @@ export default {
         waresAwardsIds: [],
         sales: '',
         sortStatus: 0,
+        boxNum: '1',
         sort: '',
         sptw: '',
         ysList: [],

src/views/goodsManage/goodsRelease/jcsz.vue

@@ -295,10 +295,10 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col v-show="form.specialArea == 3" :span="8">
+              <el-col :span="8">
-                <el-form-item label="发起人收益">
+                <el-form-item label="上传盒数" prop="boxNum">
                   <el-input
-                    v-model="form.makerIncome"
+                    v-model="form.boxNum"
                     clearable
                     :placeholder="'请输入'"
                   />
@@ -751,6 +751,7 @@ export default {
         waresAwardsIds: [],
         sales: '',
         sortStatus: 0,
+        boxNum: '1',
         waresCode: '',
         sort: '',
         sptw: '',

vue.config.js

@@ -44,9 +44,9 @@ module.exports = {
     },
     proxy: {
       '/prod-api': {
-        target: 'http://t-app.beida777.com',
+        target: 'http://192.168.0.104:8080',
-        changeOrigin: true
+        changeOrigin: true,
-        // pathRewrite: { '^/prod-api': '' }
+        pathRewrite: { '^/prod-api': '' }
       }
     }
   },