Merge remote-tracking branch 'gitea/master'

src/api/md/TASK.js

@@ -77,3 +77,11 @@ export function issueOutTaskWcsDJ(data) {
     data
   })
 }
+
+// 查询出库任务详细
+export function xmlParam() {
+  return request({
+    url: '/md/TASK/xmlParam',
+    method: 'get'
+  })
+}

src/views/md/TASK/index.vue

@@ -86,6 +86,7 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+<!--        <el-button icon="el-icon-refresh" size="mini" @click="xmlParam">读取XML</el-button>-->
       </el-form-item>
     </el-form>
 
@@ -311,7 +312,8 @@ import {
   issueWmsOutTaskToWcs,
   listTASK,
   runTASK,
-  updateTASK
+  updateTASK,
+  xmlParam
 } from "@/api/md/TASK";
 
 export default {
@@ -433,6 +435,9 @@ export default {
       this.getList();
     },
     /** 重置按钮操作 */
+    xmlParam(){
+      xmlParam()
+    },
     resetQuery() {
       this.resetForm("queryForm");
       this.handleQuery();

src/views/mes/wm/zdTask/index.vue

@@ -391,7 +391,7 @@ export default {
       } else {
         return submitOutTask(this.form).then(() => {
           this.getList();
-          this.$modal.msgSuccess("基础物料已出库！");
+          this.$modal.msgSuccess("基础物料出库中");
           this.reset();
         }).catch(() => {});
       }
@@ -442,7 +442,7 @@ export default {
           return submitOutTask(row)
         }).then(() => {
           this.getList();
-          this.$modal.msgSuccess("基础物料已出库！");
+          this.$modal.msgSuccess("基础物料出库中");
         }).catch(() => {});
       }
     },