【修改】零售单，工程单

src/views/supply/engin/components/commerce_form.vue

@@ -366,7 +366,7 @@ export default {
       let STOCK_ORDER_HAVE_END = that.stockList.find(o => o.dictCode == 'STOCK_ORDER_HAVE_END').dictValue;
       let STOCK_ORDER_ALL_NUM = that.stockList.find(o => o.dictCode == 'STOCK_ORDER_ALL_NUM').dictValue;
       if (val === '' || val === null || val === undefined) return '未检查';
-      else if (val === 0) return '无货';
+      else if (val <= 0) return '无货';
       else if (val > STOCK_ORDER_START && val <= STOCK_ORDER_END) return val;
       else if (val >= STOCK_ORDER_HAVE_START && val <= STOCK_ORDER_HAVE_END) return '有货';
       else if (val > STOCK_ORDER_ALL_NUM) return '充足';
@@ -676,6 +676,8 @@ export default {
         })
         this.goodsList.forEach(item => {
           item.customerWalletId = (item.wallets && item.wallets.length) ? item.wallets[0].customerWalletId : '';
+          item.serviceId = (item.wallets && item.wallets.length) ? item.wallets[0].serviceId : '';
+          item.serviceName = (item.wallets && item.wallets.length) ? item.wallets[0].serviceName : '';
         })
       })
     },
@@ -734,6 +736,7 @@ export default {
 
     status2Filter(item) {
       if (item.status2 === '' || item.status2 === null || item.status2 === undefined) return '未检查';
+      else if (item.status2 <= 0) return '无货';
       else if (item.status2 >= item.qty) return '可用';
       else return '短缺';
     },

src/views/supply/engin/components/home_form.vue

@@ -461,7 +461,7 @@ export default {
       let STOCK_ORDER_HAVE_END = that.stockList.find(o => o.dictCode == 'STOCK_ORDER_HAVE_END').dictValue;
       let STOCK_ORDER_ALL_NUM = that.stockList.find(o => o.dictCode == 'STOCK_ORDER_ALL_NUM').dictValue;
       if (val === '' || val === null || val === undefined) return '未检查';
-      else if (val === 0) return '无货';
+      else if (val <= 0) return '无货';
       else if (val > STOCK_ORDER_START && val <= STOCK_ORDER_END) return val;
       else if (val >= STOCK_ORDER_HAVE_START && val <= STOCK_ORDER_HAVE_END) return '有货';
       else if (val > STOCK_ORDER_ALL_NUM) return '充足';
@@ -775,6 +775,8 @@ export default {
         })
         this.goodsList.forEach(item => {
           item.customerWalletId = (item.wallets && item.wallets.length) ? item.wallets[0].customerWalletId : '';
+          item.serviceId = (item.wallets && item.wallets.length) ? item.wallets[0].serviceId : '';
+          item.serviceName = (item.wallets && item.wallets.length) ? item.wallets[0].serviceName : '';
         })
       })
     },
@@ -1038,6 +1040,7 @@ export default {
 
     status2Filter(item) {
       if (item.status2 === '' || item.status2 === null || item.status2 === undefined) return '未检查';
+      else if (item.status2 <= 0) return '无货';
       else if (item.status2 >= item.qty) return '可用';
       else return '短缺';
     },

src/views/supply/retail/components/retail_form.vue

@@ -510,6 +510,8 @@ export default {
           item.rebateRate = '';
           item.productPriceId = item.id;
           item.customerWalletId = (item.wallets && item.wallets.length) ? item.wallets[0].customerWalletId : '';
+          item.serviceId = (item.wallets && item.wallets.length) ? item.wallets[0].serviceId : '';
+          item.serviceName = (item.wallets && item.wallets.length) ? item.wallets[0].serviceName : '';
         });
         this.leftGoodsList = res.data.records;
         this.listTotal = res.data.total;
@@ -681,6 +683,10 @@ export default {
               this.$errorMsg('请选择现金钱包');
               return;
             }
+            if(!this.goodsList[i].qty) {
+              this.$errorMsg('请输入数量');
+              return;
+            }
           }
 
           let goodsList = JSON.parse(JSON.stringify(this.goodsList));

src/views/supply/retail/retail_list.vue

@@ -47,6 +47,14 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="是否直调" prop="isDirectTransfer">
+                <el-select v-model="screenForm.isDirectTransfer" placeholder="请选择是否直调">
+                  <el-option label="是" :value="true"></el-option>
+                  <el-option label="否" :value="false"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="制表人" prop="zbMan">
                 <el-input v-model="screenForm.zbMan" placeholder="请输入制表人"></el-input>
               </el-form-item>
@@ -57,7 +65,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :xs="24" :sm="12" :lg="6" class="tr">
+            <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="resetScreenForm">清空</el-button>
                 <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
@@ -156,12 +164,6 @@
             <el-table-column align="center" label="审核日期" prop="examineTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="220" fixed="right">
               <template slot-scope="scope">
-                <el-button 
-                  type="text" 
-                  @click="toExamine(scope.row)" 
-                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">
-                  审批
-                </el-button>
                 <el-popconfirm 
                   style="margin-right: 10px;" 
                   title="确定申请吗？" 
@@ -185,6 +187,12 @@
                 </el-popconfirm>
                 <el-button 
                   type="text" 
+                  @click="toExamine(scope.row)" 
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">
+                  审批
+                </el-button>
+                <el-button 
+                  type="text" 
                   @click="toForm(scope.row)" 
                   v-if="$checkBtnRole('edit', $route.meta.roles) && scope.row.examineStatus === 'SAVE'">
                   编辑
@@ -212,7 +220,7 @@
                   title="确定删除吗？" 
                   @onConfirm="handleDelete(scope.row.id)" 
                   v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus === 'SAVE'" >
-                  <el-button slot="reference" type="text">删除</el-button>
+                  <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
                 </el-popconfirm>
               </template>
             </el-table-column>
@@ -280,6 +288,7 @@ export default {
         model: '',
         jxsName: '',
         date: '',
+        isDirectTransfer: '',
         zbMan: '',
         shMan: '',
         status: '',
@@ -317,6 +326,7 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         createBy: this.screenForm.zbMan,
         examineBy: this.screenForm.shMan,
+        isDirectTransfer: this.screenForm.isDirectTransfer,
         type: 1, // 1:普通零售单，2:政策零售单
       }
     },
@@ -347,6 +357,7 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         createBy: this.screenForm.zbMan,
         examineBy: this.screenForm.shMan,
+        isDirectTransfer: this.screenForm.isDirectTransfer,
         type: 1, // 1:普通零售单，2:政策零售单
       };
       getList(params).then((res) => {