Merge remote-tracking branch 'origin/master'

build/utils.js

@@ -19,6 +19,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "TMS", "appoint", "WMS", "queue"];
 // let devModules = ["index", "statisticalReport", "inward"];
 // let devModules = ["index", "WMS", "inward"];
+// let devModules = ["index", "inward", "WMS", "queue"];
 let devModules = ["all"];
 
 //let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS",'statisticalReport'];

src/views/TMS/components/importedMine/outBoundWagon.vue

@@ -14,7 +14,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="全部" name="first">
         <mergeRowTable v-bind.sync="option1" ref="excelDom" @func="calculate">
-        <el-table-column fixed="right" label="操作" width="50">
+        <el-table-column fixed="right" label="操作" width="80">
           <template slot-scope="scope">
             <el-button
               @click="click(scope.row.resultId)"
@@ -23,18 +23,19 @@
               :disabled="scope.row.isEdit!=1"
               >修改</el-button
             >
-            <!-- <el-button
+            <el-button
             type="text"
             size="small"
+            :disabled="scope.row.isEdit!=1"
             @click="deleteclick(scope.row.resultId)"
-            >删除</el-button > -->
+            >删除</el-button >
           </template>
         </el-table-column>
       </mergeRowTable>
       </el-tab-pane>
       <el-tab-pane label="待计量" name="second">
         <mergeRowTable v-bind.sync="option1" ref="excelDom" @func="calculate">
-        <el-table-column fixed="right" label="操作" width="50">
+        <el-table-column fixed="right" label="操作" width="80">
           <template slot-scope="scope">
             <el-button
               @click="click(scope.row.resultId)"
@@ -43,11 +44,12 @@
               :disabled="scope.row.isEdit!=1"
               >修改</el-button
             >
-            <!-- <el-button
+            <el-button
             type="text"
             size="small"
+            :disabled="scope.row.isEdit!=1"
             @click="deleteclick(scope.row.resultId)"
-            >删除</el-button > -->
+            >删除</el-button >
           </template>
         </el-table-column>
       </mergeRowTable>
@@ -124,6 +126,31 @@ export default {
     click(resultId) {
       this.$router.push("/editOutBoundWagon/" + resultId);
     },
+    deleteclick(resultId){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!"
+          });
+          this.axios
+            .post( "/api/v1/tms/deleteOutBoundWagonById?resultId=" + resultId)
+            .then(() => {
+              this.onclick();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!"
+          });
+        });
+    },
     //起止时间校验
     checkSEDate(){
       if(this.startTime && this.endTime && this.startTime<=this.endTime){

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/TMS/router/index.js

@@ -1476,7 +1476,10 @@ const constantRouterMap = [
       },{
         path: "threeSectionFeeDetails",
         name: "threeSectionFeeDetails",
-        meta: { code: "xtpzgl-jggl" },
+        meta: { 
+          code: "xtpzgl-jggl",
+          keepAlive: true // 需要被缓存
+        },
         component: threeSectionFeeDetails
       },
       {

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/bar1_steel/bar1_steel_inbound.vue

@@ -68,7 +68,7 @@ export default {
       endTime: null,
       options: {
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" + 1
+        requestUrl: ""
         // selectionType: "select",
         // mapList: [],
       }

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/WMS/components/steel/bar2_steel/bar2_steel_inbound.vue

@@ -60,7 +60,7 @@ export default {
       endTime: null,
       options: {
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" + 2
+        requestUrl: ""
         // selectionType: "select",
         // mapList: [],
       }

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

@@ -66,7 +66,7 @@ export default {
       endTime: null,
       options: {
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmsInboundResult?apiId=371&warehouseId=" + 3
+        requestUrl: ""
         // selectionType: "select",
         // mapList: [],
       }

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/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckPreview.vue

@@ -620,6 +620,7 @@ export default {
     updateCapacity(row) {
       row.isIwardSteel = 4;
       row.saleOrderMaterialId = row.saleOrderId;
+      row.capacityId = row.newsCapacityId;
       if (row.newsCapacityId == null) {
         this.$message.warning("请先注册车牌号或者选中弹出后再提交!");
         return;

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

@@ -161,8 +161,15 @@
 
             <el-table-column prop="gatepostName" label="进厂门岗">
             </el-table-column>
-            <el-table-column fixed="right" label="操作" width="100">
+            <el-table-column fixed="right" label="操作" width="180">
               <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="mini"
+                  @click="ctrlZQueueAllow(scope)"
+                >
+                  撤销放行
+                </el-button>
                 <el-button type="text" size="mini" @click="updateBill(scope)">
                   修改提货单
                 </el-button>
@@ -219,8 +226,15 @@
             <el-table-column prop="sureTime" label="可进厂确认时间">
             </el-table-column>
 
-            <el-table-column fixed="right" label="操作" width="100">
+            <el-table-column fixed="right" label="操作" width="180">
               <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="mini"
+                  @click="ctrlZQueueAllow(scope)"
+                >
+                  撤销放行
+                </el-button>
                 <el-button type="text" size="mini" @click="updateBill(scope)">
                   修改提货单
                 </el-button>
@@ -315,6 +329,22 @@ export default {
     }
   },
   methods: {
+    ctrlZQueueAllow(scope) {
+      let map = {
+        listId: scope.row.listId,
+        resultTotalId: scope.row.resultTotalId
+      };
+      console.log(map);
+      this.axios.post("/api/v1/qms/ctrlZQueueAllow", map).then(res => {
+        if (res.data.code == 200) {
+          this.$message.success("撤销成功");
+          this.getNoSpellingArray();
+          this.getSpellingArray();
+        } else {
+          this.$message.error("撤单失败");
+        }
+      });
+    },
     wantEnfactory() {
       this.axios.get("/api/v1/uc/getQueueCount").then(res => {
         this.totalQueueNum = res.data.data;

src/views/sale/components/saleSelfMachine/printReceipt.vue

@@ -1,8 +1,12 @@
 <template>
   <div class="tableAllDate">
     <div class="button-box">
-      <el-button type="primary" v-print="'#pdfDom1'" @click="backScan()"
-                 style="width: 500px;height: 120px;font-size: 100px">
+      <el-button
+        type="primary"
+        v-print="'#pdfDom1'"
+        @click="backScan()"
+        style="width: 500px;height: 120px;font-size: 100px"
+      >
         <!--class="el-icon-printer"-->
         <!---->
         打印
@@ -202,7 +206,6 @@
       <i class="el-icon-back"></i>返回
     </el-button>
   </div>
-
 </template>
 
 <script>
@@ -241,7 +244,7 @@ export default {
       date: new Date().getDate(),
       htmlTitle: "客户换票送货单",
       note: "",
-      dataList:['1','2','3']
+      dataList: ["1", "2", "3"]
     };
   },
   created() {

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelAllReport.vue

@@ -293,7 +293,7 @@
         <el-table-column prop="closeEntryId" label="金蝶分录ID" width="100px">
         </el-table-column>
         <el-table-column
-          label="操作"
+          label="分录操作"
           fixed="right"
           width="120px"
           align="center"
@@ -317,7 +317,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          label="操作"
+          label="整车操作"
           fixed="right"
           width="80px"
           align="center"
@@ -477,6 +477,24 @@ export default {
         27,
         29
       ],
+      mergeList: [
+        "序号",
+        "整车操作",
+        "销售订单状态",
+        "销售订单号",
+        "发货单位",
+        "司机电话",
+        "运输订单号",
+        "签收地址",
+        "抵达地址",
+        "出厂时间",
+        "进厂时间",
+        "运单状态",
+        "车牌号",
+        "承运商",
+        "下单客户",
+        "收货地址"
+      ],
       //钢材多拼车辆线路ID
       //索引从1-10为1-10拼路线ID
       lineSpelling: [
@@ -1070,7 +1088,7 @@ export default {
       }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      if (this.columnIndexs.indexOf(columnIndex) != -1) {
+      if (this.mergeList.indexOf(column.label) != -1) {
         const _row = this.spanArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;
         return {