生成出库单

vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue

@@ -35,7 +35,7 @@
           @click="handleCreateBills()"
           >生成出库单(支持批量)</el-button
         >
-         <el-button
+        <el-button
           class="filter-item"
           type="success"
           icon="el-icon-check"
@@ -401,10 +401,10 @@
           </el-col>
           <el-col :md="20" :xs="24" style="margin-left: -80px">
             <el-form-item prop="materialGroupValue">
-                  <el-select
+              <el-select
                 v-model="formCount.materialGroupValue"
                 class="my-el-select"
-                style="width: 350px;margin-right: 15px"
+                style="width: 350px; margin-right: 15px"
                 size="medium"
                 multiple
                 placeholder="请选择"
@@ -810,6 +810,10 @@ export default {
         name: "",
         type: "",
       },
+      listBillQuery: {
+        version: "",
+        guids: [],
+      },
       page: 1,
       JobversionValue: "",
       JobversionValueVerson: "",
@@ -870,7 +874,7 @@ export default {
       tempsTabs.push({
         label: "单据流水号",
         prop: "taskId",
-        width: 85,
+        width: 120,
       });
       tempsTabs.push({
         label: "模块名称",
@@ -894,8 +898,8 @@ export default {
       });
       tempsTabs.push({
         label: "状态",
-        prop: "FileName",
+        prop: "fileName",
-        width: 100,
+        width: 150,
       });
       return tempsTabs;
     },
@@ -904,14 +908,14 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
-     handleConfirm(row){
+    handleConfirm(row) {
-      // if (this.multipleSelection.length == 0) {
+      if (this.multipleSelection.length == 0) {
-      //   this.$message({
+        this.$message({
-      //     message: "至少选择一行！",
+          message: "至少选择一行！",
-      //     type: "warning",
+          type: "warning",
-      //   });
+        });
-      //   return;
+        return;
-      // }
+      }
       var params = [];
       let myalert = ""; //声明变量，其变量必须在此声明后使用
       if (row) {
@@ -933,12 +937,12 @@ export default {
       })
         .then(() => {
           this.$axios
-            .gets("/api/settleaccount/wmsjitoutput/WmsJitOutPutAudit", params)
+            .posts("/api/settleaccount/wmsjitoutput/WmsJitOutPutAudit", params)
             .then((response) => {
               const index = this.list.indexOf(row);
               this.$notify({
                 title: "成功",
-                message: "生成成功",
+                message: "操作成功",
                 type: "success",
                 duration: 2000,
               });
@@ -953,7 +957,7 @@ export default {
         });
     },
     //出库单
-    handleCreateBills(row){
+    handleCreateBills(row) {
       if (this.multipleSelection.length == 0) {
         this.$message({
           message: "至少选择一行！",
@@ -975,14 +979,21 @@ export default {
         });
         myalert = "选中项";
       }
+      this.listBillQuery.guids = params;
+      this.listBillQuery.version = this.JobversionValue;
+      console.log("出库单条件：" + JSON.stringify(this.listBillQuery));
       this.$confirm("是否确认出库" + myalert + "?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
+          alert(this.JobversionValue);
           this.$axios
-            .gets("/api/settleaccount/wmsjitoutput/WmsJitOutPut", params)
+            .posts(
+              "/api/settleaccount/wmsjitoutput/WmsJitOutPut",
+              this.listBillQuery
+            )
             .then((response) => {
               const index = this.list.indexOf(row);
               this.$notify({
@@ -991,7 +1002,7 @@ export default {
                 type: "success",
                 duration: 2000,
               });
-               console.log(response);
+              console.log(response);
               this.getList();
             });
         })
@@ -1422,7 +1433,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "大众发票与结算核对明细表";
+      this.listQuery.name = "准时化结算核对明细";
       this.listQuery.type = this.JobversionValue;
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)

vue/src/views/ux/billManage/vwOutOrder/detail.vue

@@ -152,13 +152,14 @@ export default {
         Filters: [
           {
             logic: 0,
-            column: "",
+            column: "Enabled",
             action: 0,
-            value: "",
+            value: "true",
           }, //默认查询可用的
         ],
         SkipCount: 0,
-        MaxResultCount: 15
+        MaxResultCount: 15,
+        billNum: "",
       },
       listOutPutQuery: {
         version: "",
@@ -170,7 +171,7 @@ export default {
       formTitle: "",
       drawer: false,
       showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
+      tableHeight: document.documentElement.clientHeight - 210,
       isEdit: false,
     };
   },
@@ -218,6 +219,7 @@ export default {
       tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 });
       tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 });
       tempsTabs.push({ label: "数量", prop: "wmsBillNum", width: 100 });
+      tempsTabs.push({ label: "状态", prop: "state", width: 100 });
       return tempsTabs;
     },
   },
@@ -400,15 +402,7 @@ export default {
       } else {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
-      this.listQuery.Filters = [];
+      this.listQuery.billNum = this.customerInfo.parentId;
-      let filter = {
-        logic: 0,
-        column: "billNum",
-        action: 0,
-        value: this.customerInfo.parentId,
-      };
-      this.listQuery.Filters.push(filter);
-      //this.listQuery.ParentId = this.customerInfo.parentId;
       console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(

vue/src/views/ux/billManage/vwOutOrder/index.vue

@@ -234,8 +234,8 @@ export default {
         }
         return moment(date).format("YYYY-MM-DD HH:mm:ss");
       }
-      if (column.property == "documentStatus") {
+      if (column.property == "state") {
-        return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[
+        return { 0: "已提交", 1: "已出库", 2: "不能出库" }[
           row[column.property]
         ];
       }

vue/static/tableFieldForSearch.json

@@ -2910,11 +2910,11 @@
       {
         "fieldId": 3,
         "formType": "text",
-        "name": "单据号",
+        "name": "零件号",
         "type": 1,
         "value": "",
         "fieldType": 1,
-        "fieldName": "wmsBillNum",
+        "fieldName": "materialCode",
         "setting": []
       },
       {