8/22 工位优化

src/views/basic/workplace/addBusTypeDialog.vue

@@ -228,10 +228,10 @@ export default {
           { required: true, message: '请选择异常方式提醒', trigger: 'blur' }
         ],
         corpType: [
-          { required: true, message: '请选择往来单位类型', trigger: 'blur' }
+          // { required: true, message: '请选择往来单位类型', trigger: 'blur' }
         ],
         unitTittle: [
-          { required: true, message: '请输入往来类型标题', trigger: 'blur' }
+          // { required: true, message: '请输入往来类型标题', trigger: 'blur' }
         ],
       }
     }
@@ -311,8 +311,8 @@ export default {
           }
         })
       } else {
-        this.$refs['dataForm'].validate((valid) => {
+        this.$refs['dataForm'].validate((rules) => {
-          if (valid){
+          if (rules){
             addBusType(this.formData).then(res => {
               if (res.code == 20000) {
                 this.$message.success('新增成功')
@@ -332,6 +332,25 @@ export default {
     },
     hideForm() {
       this.closeDialog()
+    },
+    // 当scanType改变时调用此方法来更新校验规则
+    updateFormRules() {
+      if (this.formData.scanType === 1) {
+        // 当scanType为1时，不校验corpType和unitTittle
+        this.$set(this.formRules.corpType, 0, { required: false });
+        this.$set(this.formRules.unitTittle, 0, { required: false });
+      } else {
+        // 其他情况，设置校验规则
+        this.$set(this.formRules.corpType, 0, { required: true, message: '请选择往来单位类型', trigger: 'blur' });
+        this.$set(this.formRules.unitTittle, 0, { required: true, message: '请输入往来类型标题', trigger: 'blur' });
+      }
+    },
+
+  },
+  watch: {
+    // 监听scanType的变化，以更新校验规则
+    'formData.scanType': function(newVal, oldVal) {
+      this.updateFormRules();
     }
   },
   created() {

src/views/collect/IoCreateOrder.vue

@@ -42,8 +42,16 @@
             style="display: flex; margin: 0px 0 15px 0; float: right"
           >
                         <!--<el-button size="mini" type="primary" @click.native="saveOrder()" :loading="saveLoading"-->
-            <!--            >草稿保存-->
+                        <!--&gt;草稿保存-->
                         <!--</el-button>-->
+            <el-button size="mini" type="primary" @click.native="chooseDraftOrder()" :loading="submitLoading"
+                       v-if="splitType=='out'"style="margin-right: 8px;border-radius: 5%;"
+            >选入草稿单据
+            </el-button>
+            <el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"
+                       v-if="splitType=='out'"style="margin-right: 8px;border-radius: 5%;"
+            >草稿保存
+            </el-button>
             <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
                        v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
             >上货完成
@@ -252,6 +260,23 @@
         ></codesPanel>
       </el-tab-pane>
     </el-tabs>
+
+    <el-dialog
+      title="选入草稿单据"
+      :visible.sync="chooseDraftOrderVisible"
+      width="80%"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="chooseDraftOrderVisible"
+    >
+      <chooseDraftOrderDialog
+      :rowData="rowData"
+      :closeChooseDialog="closeChooseDialog"
+      :handleChoose="handleChoose"
+      >
+      </chooseDraftOrderDialog>
+    </el-dialog>
   </div>
 
 </template>
@@ -287,6 +312,7 @@ import dialogInvProduct from "@/views/inout/DialogSelectInvProduct";
 import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage";
 import {printSplitLabel} from "@/api/collect/splitCreateOrder";
 import {findInvRemind} from "@/api/inout/splitCode";
+import chooseDraftOrderDialog from "./chooseDraftOrderDialog"
 
 export default {
   name: "ioCreateOrder",
@@ -480,6 +506,7 @@ export default {
 
       //库存选入
       selectInvProductVisible: false,
+      chooseDraftOrderVisible: false,
       invQueryData: {
         invCode: null,
       },
@@ -490,6 +517,7 @@ export default {
       scanResultType: "success",
       msgTip: "当前工位存量提醒：",
       splitType: null,
+      rowData: {}
     };
   },
   components: {
@@ -497,7 +525,7 @@ export default {
     codeDetailPanel,
     editCodeDialog,
     DialogCreateOrderSelect,
-    DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct
+    DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct,chooseDraftOrderDialog
   },
   methods: {
     changeInvRemind(val) {
@@ -1415,11 +1443,29 @@ export default {
         });
       }
     },
-    saveOrder() {
+    //选入草稿单据
+    chooseDraftOrder(){
+      if (this.$isBlank(this.orderFormData.workPlaceCode)) {
+        this.$message.warning("请选择工位！");
+        return;
+      }
+      this.rowData.workPlaceCode = this.orderFormData.workPlaceCode
+      this.rowData.fifoSplit = this.orderFormData.fifoSplit
+      this.chooseDraftOrderVisible = true
+    },
+    closeChooseDialog(){
+      this.chooseDraftOrderVisible = false
+    },
+    handleChoose(billNo){
+      this.orderFormData.billNo = billNo
+      this.refreshCodesPanel();
+    },
+    draftOrder() {
       let tQuery = Object.assign(
         JSON.parse(JSON.stringify(this.orderFormData))
       );
       tQuery.billNo = this.orderFormData.billNo;
+      tQuery.orderType = 2;
       console.log("tQuery:");
       console.log(tQuery);
       if (this.orderFormData.billNo == null) {
@@ -1427,12 +1473,12 @@ export default {
         return;
       }
       this.saveLoading = true
+
       saveOrderWeb(tQuery).then((response) => {
         this.saveLoading = false
         if (response.code === 20000) {
-          if (this.closeDialog != undefined) {
+          this.$message.success("保存成功")
-            this.closeDialog();
+          this.successCloseData()
-          }
         } else {
           this.$message.error(response.message);
         }
@@ -1440,7 +1486,6 @@ export default {
         this.saveLoading = false
       });
     },
-
     // 刷新表单
     resetForm() {
       if (this.$refs["dataForm"]) {