Merge branch 'feature/供应链二期开发'

src/views/supply/engin/home_list.vue

@@ -99,10 +99,10 @@ export default {
     return {
       orderStatusParam: '',
       workerState: [
-        // {
-        //   label: '全部',
-        //   value: ''
-        // },
+        {
+          label: '全部',
+          value: ''
+        },
         // {
         //   label: '初审不通过',
         //   value: 'FAIL_ONE'
@@ -310,13 +310,6 @@ export default {
     // getList: v2EnginOrderHomeList,
     async getList(...p) {
       this.$refs.pageRef.showTable = false
-      try {
-        let res = await v2EnginOrderHomeCountList(...p)
-        this.numSum.totalC = res.data.totalC
-        this.numSum.amountC = res.data.amountC
-      } catch (error) {
-        // console.log(error)
-      }
 
       let params = {}
 
@@ -337,6 +330,13 @@ export default {
           params: [{ param: 'a.examine_status', compare: '=', value: this.orderStatusParam }, ...p[0].params]
         }
       }
+      try {
+        let res = await v2EnginOrderHomeCountList(params)
+        this.numSum.totalC = res.data.totalC
+        this.numSum.amountC = res.data.amountC
+      } catch (error) {
+        // console.log(error)
+      }
 
       return v2EnginOrderHomeList(params)
     },

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

@@ -73,15 +73,15 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-<!--        <el-col :span="24" :sm="12" :lg="12" >-->
-<!--          <el-form-item label="计划单" prop="isPlanOrder">-->
-<!--            <el-radio-group v-model="mainForm.isPlanOrder">-->
-<!--              <el-radio :label="true">是</el-radio>-->
-<!--              <el-radio :label="false">否</el-radio>-->
-<!--            </el-radio-group>-->
-<!--            <span style="color: #ff0000; margin-left: 20px">注：如需开直调单，请下计划单，不要下非计划单</span>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
+        <!--        <el-col :span="24" :sm="12" :lg="12" >-->
+        <!--          <el-form-item label="计划单" prop="isPlanOrder">-->
+        <!--            <el-radio-group v-model="mainForm.isPlanOrder">-->
+        <!--              <el-radio :label="true">是</el-radio>-->
+        <!--              <el-radio :label="false">否</el-radio>-->
+        <!--            </el-radio-group>-->
+        <!--            <span style="color: #ff0000; margin-left: 20px">注：如需开直调单，请下计划单，不要下非计划单</span>-->
+        <!--          </el-form-item>-->
+        <!--        </el-col>-->
       </el-row>
     </el-form>
 
@@ -141,6 +141,7 @@
             <el-input v-model="scope.row.qty" class="yinput" size="small" />
           </template>
         </el-table-column>
+        <el-table-column align="right" label="退订数量" prop="" min-width="100" show-overflow-tooltip />
         <el-table-column align="right" label="订单金额" min-width="100" prop="compute_amount" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ (scope.row.price * scope.row.qty) | numToFixed }}
@@ -323,7 +324,7 @@
       :close-on-click-modal="false"
       title="引用销售政策"
       @close="handleClose"
-    :append-to-body="true"
+      :append-to-body="true"
     >
       <template>
         <el-form ref="screenForm" :model="screenForm" label-width="120px" label-position="left" size="small">
@@ -856,7 +857,6 @@ export default {
           newValue.forEach((item, index) => {
             this.goodsList[index].policyConditionId = this.policyConditionId
             if (this.correspondId) {
-
               this.goodsList[index].correspondName = this.correspondName
               this.goodsList[index].correspondId = this.correspondId
             }
@@ -1053,7 +1053,6 @@ export default {
           this.screenForm.policyId = this.policyId
           if (this.listItem) {
             this.policyConditionId = data[0].id
-
           }
         } else {
           this.screenForm.policyId = data[0].policyId
@@ -1467,7 +1466,7 @@ export default {
 
         getDetail({ id: this.listItem.id }).then(res => {
           const data = res.data
-          console.log(data,99);
+          console.log(data, 99)
           this.mainForm.date = data.theTime
           this.mainForm.type = data.mainId
           this.mainForm.remark = data.remark
@@ -1510,7 +1509,7 @@ export default {
             })
           })
           this.goodsList = data.retailOrderItemList
-          console.log(this.goodsList);
+          console.log(this.goodsList)
         })
       })
     },
@@ -1714,7 +1713,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$refs.screenForm.resetFields()
+      this.$refs.screenForm.resetFields()
       this.currentPage = 1
       this.getGoodsList()
     },
@@ -1899,13 +1898,12 @@ export default {
             policyId: this.policyId,
             fileNo: this.mainForm.fileNum
           }
-          console.log(params,this.policyConditionId)
+          console.log(params, this.policyConditionId)
           if (this.listItem) {
             params.id = this.listItem.id
             editData(params).then(res => {
               this.$successMsg('编辑成功')
               this.goBack()
-             
             })
           } else {
             params.retailOrderItemList.forEach(k => {
@@ -1915,7 +1913,6 @@ export default {
             addData(params).then(res => {
               this.$successMsg('添加成功')
               this.goBack()
-             
             })
           }
         }