fix: 调整 销售执行明细汇总

src/views/supply/implement/implement_total_list.vue

@@ -9,7 +9,7 @@
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
           </template>
           <template #search>
-            <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
+            <el-form ref="screenForm" :model="screenForm" label-width="140px" size="mini" label-position="left">
               <el-row :gutter="20">
                 <!-- <el-col :xs="24" :sm="24" :lg="24">
                   <el-form-item prop="status" label-width="0">
@@ -154,6 +154,33 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="是否剔除仓储收费" prop="isCost">
+                    <el-select v-model="screenForm.isCost" clearable placeholder="请选择">
+                      <el-option label="是" value="YES" />
+                      <el-option label="否" value="NO" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="货满有效" prop="costTime">
+                    <el-date-picker
+                      v-model="screenForm.costTime"
+                      type="datetimerange"
+                      :default-time="['00:00:00', '23:59:59']"
+                      range-separator="至"
+                      style="width: 100%"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="使用单位" prop="refUseUnit">
+                    <el-input v-model="screenForm.refUseUnit" placeholder="请输入使用单位" />
+                  </el-form-item>
+                </el-col>
               </el-row>
             </el-form>
           </template>
@@ -241,6 +268,20 @@
             />
             <el-table-column
               align="left"
+              label="货满效期"
+              prop="fullCostTime"
+              min-width="150"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
+              label="项目说明"
+              prop="refProjectNote"
+              min-width="200"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="left"
               label="制单日期"
               prop="createTime"
               min-width="160"
@@ -518,7 +559,25 @@
         </div>
       </div>
     </div>
-
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="30%"
+     >
+      <el-date-picker
+        v-model="time"
+        type="datetime"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        default-time="00:00:00"
+        :picker-options="setDisabled"
+        style="width: 100%"
+        placeholder="选择日期">
+      </el-date-picker>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false;time =''">取 消</el-button>
+    <el-button type="primary" @click="onSbumit">确 定</el-button>
+  </span>
+    </el-dialog>
     <DisplaceDetail v-if="isShowDisplaceDetail" :list-item="queryItem" @backListFormDetail="backList" />
   </div>
   <!-- <template-page
@@ -598,7 +657,10 @@ export default {
         isOver: '',
         orderDate: [],
         walletIds1: [],
-        isDisplaceOrder: ''
+        isDisplaceOrder: '',
+        refUseUnit: '',
+        costTime: '',
+        isCost: ''
       },
       categoryList: [],
       statusList: [
@@ -607,11 +669,18 @@ export default {
         { label: '家用工程订单', value: 'HOME' },
         { label: '商用工程订单', value: 'TRADE' }
       ],
+      time: '',
+      dialogVisible: false,
       isCollapse: true,
       queryItem: {},
       NoRebateWalletList: [],
-      isShowDisplaceDetail: false
-    }
+      isShowDisplaceDetail: false,
+      choiceDate: '',
+      setDisabled: {
+        disabledDate: time => {
+          return time.getTime() < new Date().setDate(new Date().getDate()-1)
+        },
+      }}
   },
 
   computed: {
@@ -636,7 +705,11 @@ export default {
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
         isOver: this.screenForm.isOver,
-        isDisplaceOrder: this.screenForm.isDisplaceOrder
+        isDisplaceOrder: this.screenForm.isDisplaceOrder,
+        refUseUnit: this.screenForm.refUseUnit,
+        costStartTime: this.screenForm.costTime ? this.screenForm.costTime[0] : '',
+        costEndTime: this.screenForm.costTime ? this.screenForm.costTime[1] : '',
+        isCost: this.screenForm.isCost
       }
     }
   },
@@ -702,7 +775,11 @@ export default {
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
         isOver: this.screenForm.isOver,
-        isDisplaceOrder: this.screenForm.isDisplaceOrder
+        isDisplaceOrder: this.screenForm.isDisplaceOrder,
+        refUseUnit: this.screenForm.refUseUnit,
+        costStartTime: this.screenForm.costTime ? this.screenForm.costTime[0] : '',
+        costEndTime: this.screenForm.costTime ? this.screenForm.costTime[1] : '',
+        isCost: this.screenForm.isCost
       }
       getTotalList(params).then(res => {
         res.data.records.forEach(item => {
@@ -776,8 +853,12 @@ export default {
         this.$message.error('请选择需要剔除的数据')
         return
       }
-      const ids = this.recordSelected.map(k => k.id)
-      setUpdateOrderCost({ orderId: ids.toString() }).then(res => {
+      this.dialogVisible = true
+    },
+    onSbumit() {
+      const ids = this.recordSelected.map(k => k.orderItemId)
+      setUpdateOrderCost({ orderId: ids.toString(),time: this.time }).then(res => {
+        this.dialogVisible = false
         this.$successMsg('剔除成功')
         this.getList()
       })