【修改】默认不勾计划单

src/views/supply/deliver/sum_list.vue

@@ -206,10 +206,10 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="打印状态" prop="printStatus">
+              <el-form-item label="预约提货打印" prop="printStatus">
                 <el-select
                   v-model="screenForm.printStatus"
-                  placeholder="选择打印状态"
+                  placeholder="选择预约提货打印"
                   clearable
                   filterable
                   style="width: 100%"
@@ -260,6 +260,27 @@
                 <el-input v-model="screenForm.createBy" placeholder="请输入制单人" />
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="发货汇总打印" prop="invoicePrintStatus">
+                <el-select
+                  v-model="screenForm.invoicePrintStatus"
+                  placeholder="选择发货汇总打印"
+                  clearable
+                  filterable
+                  style="width: 100%"
+                >
+                  <el-option
+                    label="是"
+                    :value="1"
+                  />
+                  <el-option
+                    label="否"
+                    :value="0"
+                  />
+
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -926,6 +947,7 @@ export default {
         printStatus: '',
         discriminate: '',
         refEnginRecordNo: '',
+        invoicePrintStatus: '',
         createBy: ''
       },
       invoiceList: [
@@ -1004,6 +1026,7 @@ export default {
         k3ServiceId: this.screenForm.k3ServiceId,
         mainOrderId: this.screenForm.mainOrderId,
         printStatus: this.screenForm.printStatus,
+        invoicePrintStatus: this.screenForm.invoicePrintStatus,
         approvalEndTime: this.screenForm.approvaTime
           ? this.screenForm.approvaTime[1]
           : '',
@@ -1115,6 +1138,7 @@ export default {
         materialOldNumber: this.screenForm.goodsOldCode,
         specification: this.screenForm.model,
         printStatus: this.screenForm.printStatus,
+        invoicePrintStatus: this.screenForm.invoicePrintStatus,
         discriminate: this.screenForm.discriminate,
         createBy: this.screenForm.createBy,
 

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

@@ -234,7 +234,7 @@
           <el-button v-if="detailData.examineStatus === 'SAVE' || detailData.examineStatus === 'WAIT'" type="danger" @click="closeData">关闭订单</el-button>
           <!-- <el-button type="primary" @click="openDirectDialog" v-if="!isDealer">提前开票</el-button> -->
 
-          <template v-if="detailData.isPlanOrder !== null || detailData.isPlanOrder != false">
+          <template v-if="detailData.isPlanOrder=='true'">
             <el-button v-if="!isDealer" type="primary" @click="overData">直调完结</el-button>
             <el-button v-if="!isDealer" type="primary" :disabled="detailData.directTransferStatus" @click="openDeliverDialog">直调发货</el-button>
           </template>

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

@@ -177,7 +177,7 @@
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24">
           <el-form-item>
-            <el-checkbox v-model="isPlanOrder" :disabled="listItem" true-label="true" false-label="false">计划单</el-checkbox>
+            <el-checkbox v-model="isPlanOrder" :falsebled="listItem" true-label="true" false-label="false">计划单</el-checkbox>
           </el-form-item>
         </el-col>
 
@@ -486,7 +486,7 @@ export default {
       flag: false,
       isFirst: false,
       salesmanList: [],
-      isPlanOrder: 'true'
+      isPlanOrder: 'false'
     }
   },