Merge branch 'feature/Feature-copy' into develop

src/views/supply/deliver/sum_list.vue

@@ -212,6 +212,29 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="打印状态" prop="types">
+                <el-select
+                  v-model="screenForm.printStatus"
+                  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>
@@ -898,7 +921,8 @@ export default {
         k3ServiceId: "",
         mainOrderId: "",
         approvaTime: "",
-        types:''
+        types:'',
+        printStatus:''
       },
       invoiceList:[
         {
@@ -972,6 +996,7 @@ export default {
         serviceId: this.screenForm.salesMan,
         k3ServiceId: this.screenForm.k3ServiceId,
         mainOrderId: this.screenForm.mainOrderId,
+        printStatus:this.screenForm.printStatus,
         approvalEndTime: this.screenForm.approvaTime
           ? this.screenForm.approvaTime[1]
           : "",
@@ -1082,6 +1107,8 @@ export default {
         materialNumber: this.screenForm.goodsCode,
         materialOldNumber: this.screenForm.goodsOldCode,
         specification: this.screenForm.model,
+        printStatus:this.screenForm.printStatus,
+
         createStartTime: this.screenForm.createDate
           ? this.screenForm.createDate[0]
           : "",