Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/TMS/components/importedShip/addLoadShip.vue

@@ -163,7 +163,7 @@ export default {
         resultActualInstallations: this.form.resultActualInstallations,
         resultLoadShipDate: sjTime(this.form.resultLoadShipDate),
         resultIsClear: this.form.resultIsClear,
-        resultArrivalTime: sjTime(this.form.resultArrivalTime),
+        resultArrivalTime: sjTime(this.form.resultLoadShipDate),
         resultOutWharyName: this.form.resultOutWharyName,
         resultOutWharyTime: sjTime(this.form.resultOutWharyTime),
         resultMemo: this.form.resultMemo,
@@ -176,7 +176,7 @@ export default {
         moistureTonnage: this.moistureTonnage,
         waterUnitPrice:this.form.waterUnitPrice,
         unitPriceId:this.form.unitPriceId,
-        //isNeedAssemble:this.form.isNeedAssemble,
+        isNeedAssemble:this.form.isNeedAssemble,
         userId: getCookie("userId"),
       };
       console.log("mapVal:",mapVal);

src/views/TMS/components/importedShip/updateLoadShip.vue

@@ -5,6 +5,12 @@
     <div class="form">
       <div class="form_box">
           <dil-form :formId="136" v-model="form1" ref="from1"></dil-form>
+          <el-form :inline="true">
+          <el-form-item label="是否拼装" >
+            <el-radio v-model="form1.isNeedAssemble" label="否" style="margin-left :10px">否</el-radio>
+            <el-radio v-model="form1.isNeedAssemble" label="是">是</el-radio>
+          </el-form-item>
+        </el-form>
       </div> 
     </div>
     <!-- 确定和取消 -->
@@ -62,6 +68,7 @@ export default {
         resultActualInstallations: this.form1.resultActualInstallations,
         outWharyResultId:this.outWharyResultId,
         // rwarehouseMaterialId: this.form1.rwarehouseMaterialId,
+        isNeedAssemble:this.form1.isNeedAssemble,
         resultArrivalPortTime: sjTime(
           this.form1.resultArrivalPortTime
         ),
@@ -75,7 +82,7 @@ export default {
         resultOutPortName:this.form1.resultOutPortName,
         //planDate:sjTime(this.form1.planDate),
         //planDeliveryDate:sjTime(this.form1.planDeliveryDate),
-        //resultHeavyWeight:this.form1.resultHeavyWeight,
+        resultHeavyWeight:this.form1.resultHeavyWeight,
         userId:getCookie("userId"),
       };
               //判断放货数量是否为数字
@@ -94,7 +101,7 @@ export default {
     
       this.axios
         .post(
-          "/api/v1/tms/updateLoadShip",
+          "/api/v1/tms/updateThreeSectionDetails",
           mapVal
         )
         .then((res) => {

src/views/WMS/components/steel/addSteelInbound.vue

@@ -28,7 +28,7 @@
       <el-input class="input" v-model="remark"> </el-input>
     </div>
     <!-- 模态窗口 -->
-    <el-drawer :visible.sync="drawer" :direction="direction" size="40%">
+    <el-drawer :visible.sync="drawer" :direction="direction" size="50%">
       <div style="margin-bottom: 10px">
         <el-input
           placeholder="请输入内容"
@@ -41,10 +41,20 @@
         </el-button>
       </div>
       <div v-show="a == 1">
-        <dilTable
-          v-bind.sync="first"
-          @radio-change="currentRadioChange1"
-        ></dilTable>
+        <dilTable v-bind.sync="first" @radio-change="currentRadioChange1">
+          <el-table-column label="操作" width="140px">
+            <template slot-scope="scope">
+              <el-input v-model.number="scope.row.quantity" style="width:60px">
+              </el-input>
+              <el-button
+                type="text"
+                size="mini"
+                @click="deleteInboundMaterial(scope.row)"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </dilTable>
       </div>
       <div v-show="a == 2">
         <dilTable
@@ -122,6 +132,49 @@ export default {
     this.endTime = new Date(this.startTime + 86400000);
   },
   methods: {
+    deleteInboundMaterial(row) {
+      if (Number(row.quantity) > 0) {
+        this.$confirm("确定删除?继续", "提示", {
+          cancelButtonText: "取消",
+          confirmButtonText: "确定"
+        }).then(() => {
+          console.log(row);
+          this.axios
+            .post(
+              "/api/v1/wms/deleteInboundMaterial?warehouseId=3&materialCode=" +
+                row.materialCode +
+                "&materialSpecification=" +
+                row.materialSpecification +
+                "&materialModel=" +
+                row.materialModel +
+                "&quantity=" +
+                row.quantity
+            )
+            .then(res => {
+              if (res.data.code == 200) {
+                this.$message.success("删除成功");
+                this.first.requestUrl =
+                  "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId=" +
+                  3 +
+                  "&status=" +
+                  1 +
+                  "&con=" +
+                  "" +
+                  "&startTime=" +
+                  sjTime(this.startTime) +
+                  "&endTime=" +
+                  sjTime(this.endTime) +
+                  "&i=" +
+                  new Date();
+              } else {
+                this.$message.error("删除失败");
+              }
+            });
+        });
+      } else {
+        this.$message.warning("请输入需要删除的物资件数");
+      }
+    },
     getTheoreticalByInfo() {
       this.axios
         .post(

src/views/WMS/components/steel/bar1_steel/bar1_addSteelInbound.vue

@@ -41,10 +41,20 @@
         </el-button>
       </div>
       <div v-show="a == 1">
-        <dilTable
-          v-bind.sync="first"
-          @radio-change="currentRadioChange1"
-        ></dilTable>
+        <dilTable v-bind.sync="first" @radio-change="currentRadioChange1">
+          <el-table-column label="操作" width="140px">
+            <template slot-scope="scope">
+              <el-input v-model.number="scope.row.quantity" style="width:60px">
+              </el-input>
+              <el-button
+                type="text"
+                size="mini"
+                @click="deleteInboundMaterial(scope.row)"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column></dilTable
+        >
       </div>
       <div v-show="a == 2">
         <dilTable
@@ -122,6 +132,49 @@ export default {
     this.endTime = new Date(this.startTime + 86400000);
   },
   methods: {
+    deleteInboundMaterial(row) {
+      if (Number(row.quantity) > 0) {
+        this.$confirm("确定删除?继续", "提示", {
+          cancelButtonText: "取消",
+          confirmButtonText: "确定"
+        }).then(() => {
+          console.log(row);
+          this.axios
+            .post(
+              "/api/v1/wms/deleteInboundMaterial?warehouseId=1&materialCode=" +
+                row.materialCode +
+                "&materialSpecification=" +
+                row.materialSpecification +
+                "&materialModel=" +
+                row.materialModel +
+                "&quantity=" +
+                row.quantity
+            )
+            .then(res => {
+              if (res.data.code == 200) {
+                this.$message.success("删除成功");
+                this.first.requestUrl =
+                  "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId=" +
+                  1 +
+                  "&status=" +
+                  1 +
+                  "&con=" +
+                  "" +
+                  "&startTime=" +
+                  sjTime(this.startTime) +
+                  "&endTime=" +
+                  sjTime(this.endTime) +
+                  "&i=" +
+                  new Date();
+              } else {
+                this.$message.error("删除失败");
+              }
+            });
+        });
+      } else {
+        this.$message.warning("请输入需要删除的物资件数");
+      }
+    },
     getTheoreticalByInfo() {
       this.axios
         .post(

src/views/WMS/components/steel/bar2_steel/bar2_addSteelInbound.vue

@@ -41,10 +41,20 @@
         </el-button>
       </div>
       <div v-show="a == 1">
-        <dilTable
-          v-bind.sync="first"
-          @radio-change="currentRadioChange1"
-        ></dilTable>
+        <dilTable v-bind.sync="first" @radio-change="currentRadioChange1">
+          <el-table-column label="操作" width="140px">
+            <template slot-scope="scope">
+              <el-input v-model.number="scope.row.quantity" style="width:60px">
+              </el-input>
+              <el-button
+                type="text"
+                size="mini"
+                @click="deleteInboundMaterial(scope.row)"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column></dilTable
+        >
       </div>
       <div v-show="a == 2">
         <dilTable
@@ -122,6 +132,49 @@ export default {
     this.endTime = new Date(this.startTime + 86400000);
   },
   methods: {
+    deleteInboundMaterial(row) {
+      if (Number(row.quantity) > 0) {
+        this.$confirm("确定删除?继续", "提示", {
+          cancelButtonText: "取消",
+          confirmButtonText: "确定"
+        }).then(() => {
+          console.log(row);
+          this.axios
+            .post(
+              "/api/v1/wms/deleteInboundMaterial?warehouseId=2&materialCode=" +
+                row.materialCode +
+                "&materialSpecification=" +
+                row.materialSpecification +
+                "&materialModel=" +
+                row.materialModel +
+                "&quantity=" +
+                row.quantity
+            )
+            .then(res => {
+              if (res.data.code == 200) {
+                this.$message.success("删除成功");
+                this.first.requestUrl =
+                  "/api/v1/wms/getSteelMaterialModelList?apiId=447&warehouseId=" +
+                  2 +
+                  "&status=" +
+                  1 +
+                  "&con=" +
+                  "" +
+                  "&startTime=" +
+                  sjTime(this.startTime) +
+                  "&endTime=" +
+                  sjTime(this.endTime) +
+                  "&i=" +
+                  new Date();
+              } else {
+                this.$message.error("删除失败");
+              }
+            });
+        });
+      } else {
+        this.$message.warning("请输入需要删除的物资件数");
+      }
+    },
     getTheoreticalByInfo() {
       this.axios
         .post(

src/views/appoint/components/saleContract/saleOrderSteel.vue

@@ -692,7 +692,9 @@ export default {
           for (let j = 0; j < i; j++) {
             if (
               this.tableData[i].saleRemark === this.tableData[j].saleRemark &&
-              this.tableData[i].receiveName === this.tableData[j].receiveName
+              this.tableData[i].receiveName === this.tableData[j].receiveName &&
+              this.tableData[i].saleOrderReceiveCustomer ===
+                this.tableData[j].saleOrderReceiveCustomer
             ) {
               this.tableData[i].saleOrderNo = this.tableData[j].saleOrderNo;
               break;
@@ -704,8 +706,6 @@ export default {
           }
         }
       }
-      console.log(this.tableData);
-      debugger;
       // this.tableData = this.tableData.sort(this.compare("saleOrderNo"));
       // debugger;
       //需要遍历数组，以销售订单编号为分类

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -246,10 +246,8 @@
         <el-tab-pane label="仓库排队列表" name="third">
           <el-table
             :data="tableData3"
-            :span-method="objectSpanMethod"
             border
             style="width: 100%; margin-top: 20px"
-            @selection-change="handleSelectionChange"
             max-height="500px"
           >
             <el-table-column prop="warehouseName" label="仓库" fit></el-table-column>
@@ -311,6 +309,7 @@ export default {
     this.infomation();
     this.getSpellingArray();
     this.getNoSpellingArray();
+    this.getStoreArray();
     this.getSteelOrderNum();
     this.wantEnfactory();
     this.start();
@@ -364,6 +363,7 @@ export default {
       this.getSpellingArray();
       this.getNoSpellingArray();
       this.getSteelOrderNum();
+      this.getStoreArray();
       this.redDotNum = null;
       this.totalQueueNum = null;
       this.totalQueueNumFirst = null;
@@ -538,7 +538,7 @@ export default {
         )
         .then(res => {
           this.tableData3 = res.data.data;
-          console.log("getStoreArray "+this.tableData3);
+          console.log("getStoreArray "+JSON.stringify(this.tableData3));
         });
     },
     onclick() {
@@ -635,6 +635,7 @@ export default {
           this.$refs.mutiData.clearSelection();
           this.getNoSpellingArray();
           this.getSpellingArray();
+          this.getStoreArray();
           this.redDotNum = null;
           this.totalQueueNum = null;
           this.totalQueueNumFirst = null;
@@ -647,6 +648,7 @@ export default {
           this.$refs.mutiData.clearSelection();
           this.getNoSpellingArray();
           this.getSpellingArray();
+          this.getStoreArray();
           this.redDotNum = null;
           this.totalQueueNum = null;
           this.totalQueueNumFirst = null;