模具 #28

src/pages/Middle/Mold/InkjetPrinter/print.vue

@@ -180,15 +180,6 @@ export default {
 
       for (let key in this.searchFormData) {
         let value = this.searchFormData[key];
-        if (key == "inventory") {
-          if (value && value[0]) {
-            rules.push({
-              field: " id in (select manufactureOrderID from v_MP_ManufactureOrder_b where inventoryID = " + value[0] + ") ",
-              type: "sql"
-            });
-          }
-
-        } else {
         if (value) {
             let mode = findMode(key);
             rules.push({
@@ -197,7 +188,6 @@ export default {
               value: value
             });
           }
-        }
 
       }
       if (this.start_time) {

src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue

@@ -34,7 +34,8 @@
         <template #default="{ row }">
           <div v-if="row.id">
             <div v-if="row.complete_time">{{ $mk.getDateString(row.complete_time) }}</div>
-            <a-button v-else :disabled="!(isComponentOutProduct() || pageIsComplete())" @click.stop="pageComplete(row)" type="primary">完成</a-button>
+            <a-button v-else :disabled="!(isComponentOutProduct() || pageIsComplete())" @click.stop="pageComplete(row)"
+              type="primary">完成</a-button>
           </div>
         </template>
       </vxe-column>
@@ -114,8 +115,8 @@
         </template>
       </vxe-column>
 
-      <vxe-column field="send_type" v-if="getDataId() && readonly" title="发料人员类型" width="160" :params="{ data: options_user_type }"
-        formatter='formatEnum'></vxe-column>
+      <vxe-column field="send_type" v-if="getDataId() && readonly" title="发料人员类型" width="160"
+        :params="{ data: options_user_type }" formatter='formatEnum'></vxe-column>
 
 
       <vxe-column field="complete_type" v-if="getDataId() && readonly" title="完工人员类型" width="160"
@@ -551,6 +552,11 @@ export default {
 
     postDataUpdate() {
       let postdata = {}; 
+
+      this.detailsData2.forEach(item => { 
+        item.component_line = this.detailsData[0].component_line;
+      })
+
       postdata.mold_production_order_component = this.$mk.getPostFieldValue({
         rowFilter: (row) => { return row.id || row.component_id },
         dataId: this.getDataId_BigInt(),
@@ -700,4 +706,5 @@ export default {
 
 .oplinks2 i {
   margin-left: 5px;
-}</style>
+}
+</style>