sdas

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/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_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/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>
@@ -302,6 +316,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

@@ -236,8 +236,8 @@ export default {
       month: new Date().getMonth() + 1,
       date: new Date().getDate(),
       htmlTitle: "客户换票送货单",
-      note: ""
-      dataList:['1','2','3']
+      note: "",
+      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 {