tijiao

build/utils.js

@@ -22,10 +22,10 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "appoint", "statisticalReport"];
 
 // let devModules = ["index", "appoint", "statisticalReport", "WMS","TMS"];
-let devModules = ["all"];
+// let devModules = ["index", "inward", "appoint", "queue"];
 
 // let devModules = ["index", "appoint", "statisticalReport", "WMS"];
-// let devModules = ["all"];
+let devModules = ["all"];
 
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];

src/views/appoint/components/inward/rangePoint.vue

@@ -0,0 +1,52 @@
+<template>
+  <div class="rangePoint">
+    <div class="item">
+      <el-form>
+        <el-form-item>
+          <el-input
+            v-model="input"
+            placeholder="请输入查询参数"
+            style="width:250px"
+          ></el-input>
+          <el-button type="primary" @click="onclick">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "/api/v1/ams/getRangePoint?apiId=499"
+      },
+      input: null
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl =
+        "/api/v1/ams/getRangePoint?apiId=499&con=" +
+        this.input +
+        "&i=" +
+        new Date();
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.rangePoint {
+  .item {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+}
+</style>

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

@@ -968,8 +968,14 @@ export default {
     }
   },
   methods: {
+    isReceiveHaveArea(receiveId) {
+      this.axios
+        .post("/api/v1/uc/isReceiveHaveArea?receiveId=" + receiveId)
+        .then(res => {
+          console.log(res);
+        });
+    },
     handleSelectAddress(item) {
-      console.log(item);
       this.saleShipperAddressName = item.addressPlace;
       this.province = item.addressProvince;
       this.city = item.addressDistrict;
@@ -1006,11 +1012,9 @@ export default {
     },
     onblur() {
       this.isCellClick = 0;
-      console.log("我这里值也变化了");
     },
     goclick() {
       this.isCellClick = 1;
-      console.log("我这里值变化了");
     },
     rowDbClick1(row) {
       this.selectedMaterialId = row.materialId;
@@ -1110,6 +1114,7 @@ export default {
     handleSelectConsignee(item) {
       this.consigneeName = item.consigneeCompanyName;
       this.consigneeId = item.consigneeId;
+      // this.isReceiveHaveArea(this.consigneeId);
       //带出摘要
       this.axios
         .post("/api/v1/uc/getSaleArea?receiveId=" + this.consigneeId)

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

@@ -153,7 +153,7 @@
         </el-table-column>
         <el-table-column property="materialSpecification" label="规格">
         </el-table-column>
-        <el-table-column property="meterNumber" label="物资件数">
+        <el-table-column property="orderPlanWeight" label="物资件数">
         </el-table-column>
         <el-table-column property="materialModel" label="型号">
         </el-table-column>
@@ -1241,8 +1241,7 @@ export default {
         columnIndex === 1 ||
         columnIndex === 2 ||
         columnIndex === 3 ||
-        columnIndex === 4 ||
-        columnIndex === 8
+        columnIndex === 4
       ) {
         const _row = this.spanArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;

src/views/appoint/router/index.js

@@ -69,6 +69,7 @@ import inwardAddTransPrice from "../components/inward/addTransPrice.vue";
 import saleOrderOODetails from "../components/saleContract/saleOrderOODetails.vue";
 import updateSaleOrderSteel from "../components/saleContract/updateSaleOrderSteel.vue";
 import copySteelOrder from "../components/saleContract/copySteelOrder.vue";
+import rangeValuePoint from "../components/inward/rangePoint.vue";
 Vue.use(Router);
 
 const constantRouterMap = [
@@ -468,6 +469,12 @@ const constantRouterMap = [
         name: "copySteelOrder",
         meta: { code: "xtpzgl-yhgl" },
         component: copySteelOrder
+      },
+      {
+        path: "rangeValuePoint",
+        name: "rangeValuePoint",
+        meta: { code: "xtpzgl-yhgl" },
+        component: rangeValuePoint
       }
     ]
   }

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -321,6 +321,7 @@ import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
 import { checkTel } from "@/utils/validator.js";
+import returnResultVue from "../offsetSteel/truckTransport/returnResult.vue";
 export default {
   components: { PageTitle },
   data() {
@@ -450,7 +451,28 @@ export default {
       form: {}
     };
   },
+  computed: {
+    requirementType() {
+      return this.form.requirementType;
+    }
+  },
   watch: {
+    requirementType() {
+      if (this.form.requirementType == "计重") {
+        this.materialTable.requestUrl =
+          "/api/v1/uc/getInwardWeightMaterial?apiId=498&i=" + new Date();
+      } else {
+        this.materialTable.requestUrl =
+          "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date();
+      }
+    },
+    // form: {
+    //   handler(oldVal, newVal) {
+    //     console.log(oldVal);
+    //     console.log(newVal);
+    //   },
+    //   deep: true
+    // },
     value() {
       if (this.value) {
         // console.log(this.value)
@@ -517,7 +539,6 @@ export default {
     selectionChange(selection) {
       this.selectionList1 = [];
       this.selectionList1 = selection;
-      console.log("selection", selection);
     },
     unloadPoint(index) {
       this.getUnloadRequestUrl();
@@ -535,8 +556,13 @@ export default {
     ondrawer(num) {
       if (num == 1) {
         this.table = true;
-        this.materialTable.requestUrl =
-          "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date();
+        if (this.form.requirementType == "计重") {
+          this.materialTable.requestUrl =
+            "/api/v1/uc/getInwardWeightMaterial?apiId=498&i=" + new Date();
+        } else {
+          this.materialTable.requestUrl =
+            "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date();
+        }
       } else if (num == 3) {
         this.drawer2 = true;
         this.options3.requestUrl = "/api/v1/uc/getCapacityType?apiId=460";
@@ -553,9 +579,19 @@ export default {
         this.materialTable.requestUrl =
           "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date();
       } else {
-        this.materialTable.requestUrl =
-          "/api/v1/uc/queryMaterialByLike?apiId=244&index=" +
-          this.inputMaterial;
+        if (this.form.requirementType == "计重") {
+          this.materialTable.requestUrl =
+            "/api/v1/uc/getInwardWeightMaterial?apiId=498&i=" +
+            new Date() +
+            "&index=" +
+            this.inputMaterial;
+        } else {
+          this.materialTable.requestUrl =
+            "/api/v1/uc/queryMaterialByLike?apiId=244&i=" +
+            new Date() +
+            "&index=" +
+            this.inputMaterial;
+        }
         this.inputMaterial = null;
       }
     },
@@ -616,7 +652,9 @@ export default {
           requirementPlatformId: e.requirementPlatformId,
           requirementUnloadUnitId: e.requirementUnloadUnitId,
           orderMaterialNumber: e.orderMaterialNumber,
-          orderMaterialWeight: e.orderMaterialWeight
+          orderMaterialWeight: e.orderMaterialWeight,
+          loadPointName: e.loadPointName,
+          unloadPointName: e.unloadPointName
         };
         this.tableData.push(addmap);
       });
@@ -624,8 +662,19 @@ export default {
     onclick(a) {
       if (this.input != null) {
         if (a == 1) {
-          this.materialTable.requestUrl =
-            "/api/v1/uc/queryMaterialByLike?apiId=244&index=" + this.input;
+          if (this.form.requirementType == "计重") {
+            this.materialTable.requestUrl =
+              "/api/v1/uc/getInwardWeightMaterial?apiId=498&i=" +
+              new Date() +
+              "&index=" +
+              this.input;
+          } else {
+            this.materialTable.requestUrl =
+              "/api/v1/uc/queryMaterialByLike?apiId=244&i=" +
+              new Date() +
+              "&index=" +
+              this.input;
+          }
           this.input = null;
         } else {
           this.second1.requestUrl =
@@ -633,8 +682,14 @@ export default {
           this.input = null;
         }
       } else {
-        this.materialTable.requestUrl =
-          "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date();
+        if (this.form.requirementType == "计重") {
+          this.materialTable.requestUrl =
+            "/api/v1/uc/getInwardWeightMaterial?apiId=498&i=" + new Date();
+        } else {
+          this.materialTable.requestUrl =
+            "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date();
+        }
+        this.inputMaterial = null;
       }
     },
     currentRadioChange1(selection) {
@@ -657,12 +712,11 @@ export default {
     },
     selectionChange1(radio) {
       console.log(radio);
-      (this.capacityTypeName = radio.capacityTypeName),
-        (this.capacityTypeId = radio.capacityTypeId),
-        (this.whether = radio.whether);
+      this.capacityTypeName = radio.capacityTypeName;
+      this.capacityTypeId = radio.capacityTypeId;
+      this.whether = radio.whether;
     },
     currentRadioChange2(selection) {
-      console.log(selection);
       if (this.a == 2) {
         this.truckPoint = selection.warehouseName;
         this.requiremntUnitId = selection.warehouseId;
@@ -670,12 +724,14 @@ export default {
         // console.log(this.tableData[this.index])
         this.tableData[this.index].requirementUnloadUnitId =
           selection.warehouseId;
+        this.tableData[this.index].unloadPointName = selection.warehouseName;
         this.tableData[this.index].truckPoint1 = selection.warehouseName;
         this.refreshTable();
       } else if (this.a == 4) {
         // console.log(this.tableData[this.index])
         this.tableData[this.index].requirementPlatformId =
           selection.warehouseId;
+        this.tableData[this.index].loadPointName = selection.warehouseName;
         this.tableData[this.index].requirementPlatformName =
           selection.warehouseName;
         this.refreshTable();
@@ -790,7 +846,6 @@ export default {
         orgCode: getCookie("orgCode"),
         remark: this.form.Tel + this.capacityTypeName + this.form.typeRemarks
       };
-      console.log("requirement", requiremnet);
       this.axios
         .post("/api/v1/ams/addTruckRequirement", requiremnet)
         .then(res => {

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

@@ -42,6 +42,13 @@
             <i class="el-icon-d-arrow-right"></i>放行
           </el-button></el-form-item
         >
+        <el-form-item
+          ><el-button type="primary" class="btn" disabled>
+            厂内钢材车辆总数
+          </el-button>
+          <el-input disabled style="width:100px" v-model="steelOrderNum">
+          </el-input>
+        </el-form-item>
       </el-form>
     </div>
     <!-- 物资选择模态框 -->
@@ -118,26 +125,14 @@
             <el-table-column type="index" width="50"> </el-table-column>
             <el-table-column prop="capacityNumber" label="车牌号" fit>
             </el-table-column>
-            <el-table-column prop="resultStartTime" label="排队开始时间">
+            <el-table-column prop="consigneeName" label="客户" fit>
             </el-table-column>
-            <el-table-column
-              prop="listNodeOrder"
-              label="序号"
-            ></el-table-column>
             <el-table-column prop="materialName" label="物资名称">
             </el-table-column>
-            <el-table-column prop="materialSpecification" label="物资规格">
-            </el-table-column>
-            <el-table-column prop="materialModel" label="物资型号">
+            <el-table-column prop="materialSpecification" label="规格型号">
             </el-table-column>
             <el-table-column prop="materialNumber" label="物资件数">
             </el-table-column>
-            <el-table-column prop="driverTel" label="司机电话号码">
-            </el-table-column>
-            <el-table-column prop="sureTime" label="可进厂确认时间">
-            </el-table-column>
-            <el-table-column prop="gatepostName" label="进厂门岗">
-            </el-table-column>
             <el-table-column label="装货点" width="100">
               <template slot-scope="scope">
                 <el-select size="mini" v-model="scope.row.id">
@@ -151,13 +146,27 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column fixed="right" label="操作" width="100">
+            <el-table-column prop="resultStartTime" label="排队开始时间">
+            </el-table-column>
+            <el-table-column
+              prop="listNodeOrder"
+              label="序号"
+            ></el-table-column>
+            <el-table-column prop="driverTel" label="司机电话号码">
+            </el-table-column>
+            <el-table-column prop="sureTime" label="可进厂确认时间">
+            </el-table-column>
+
+            <el-table-column prop="gatepostName" label="进厂门岗">
+            </el-table-column>
+
+            <!-- <el-table-column fixed="right" label="操作" width="100">
               <template slot-scope="scope">
                 <el-button type="text" size="mini" @click="updateBill(scope)">
                   修改提货单
                 </el-button>
               </template>
-            </el-table-column>
+            </el-table-column> -->
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="多拼车辆排队链表" name="second">
@@ -172,27 +181,14 @@
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column prop="capacityNumber" label="车牌号" fit>
             </el-table-column>
-            <el-table-column prop="grid" label="拼数" fit> </el-table-column>
-            <el-table-column prop="resultStartTime" label="排队开始时间">
+            <el-table-column prop="consigneeName" label="客户" fit>
             </el-table-column>
-            <el-table-column
-              prop="listNodeOrder"
-              label="序号"
-            ></el-table-column>
             <el-table-column prop="materialName" label="物资名称">
             </el-table-column>
-            <el-table-column prop="materialSpecification" label="物资规格">
-            </el-table-column>
-            <el-table-column prop="materialModel" label="物资型号">
+            <el-table-column prop="materialSpecification" label="规格型号">
             </el-table-column>
             <el-table-column prop="materialNumber" label="物资件数">
             </el-table-column>
-            <el-table-column prop="driverTel" label="司机电话号码">
-            </el-table-column>
-            <el-table-column prop="gatepostName" label="进厂门岗">
-            </el-table-column>
-            <el-table-column prop="sureTime" label="可进厂确认时间">
-            </el-table-column>
             <el-table-column label="装货点" width="100">
               <template slot-scope="scope">
                 <el-select size="mini" v-model="scope.row.id">
@@ -206,6 +202,20 @@
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column prop="grid" label="拼数" fit> </el-table-column>
+            <el-table-column prop="resultStartTime" label="排队开始时间">
+            </el-table-column>
+            <el-table-column
+              prop="listNodeOrder"
+              label="序号"
+            ></el-table-column>
+            <el-table-column prop="driverTel" label="司机电话号码">
+            </el-table-column>
+            <el-table-column prop="gatepostName" label="进厂门岗">
+            </el-table-column>
+            <el-table-column prop="sureTime" label="可进厂确认时间">
+            </el-table-column>
+
             <el-table-column fixed="right" label="操作" width="100">
               <template slot-scope="scope">
                 <el-button type="text" size="mini" @click="updateBill(scope)">
@@ -269,6 +279,7 @@ export default {
     this.infomation();
     this.getSpellingArray();
     this.getNoSpellingArray();
+    this.getSteelOrderNum();
     this.wantEnfactory();
     this.start();
   },
@@ -423,11 +434,14 @@ export default {
         columnIndex === 0 ||
         columnIndex === 1 ||
         columnIndex === 2 ||
-        columnIndex === 3 ||
-        columnIndex === 4 ||
+        columnIndex === 7 ||
+        columnIndex === 8 ||
         columnIndex === 9 ||
         columnIndex === 10 ||
-        columnIndex === 13
+        columnIndex === 11 ||
+        columnIndex === 12 ||
+        columnIndex === 13 ||
+        columnIndex === 14
       ) {
         const _row = this.spanArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;
@@ -453,6 +467,7 @@ export default {
         .post("/api/v1/qms/getQueueListByQueueUp?isSpelling=0&i=" + new Date())
         .then(res => {
           this.tableData1 = res.data.data;
+          console.log(this.tableData1);
         });
     },
     getSpellingArray() {
@@ -463,6 +478,7 @@ export default {
         )
         .then(res => {
           this.tableData = res.data.data;
+          console.log(this.tableData);
           this.getSpanArr(this.tableData);
         });
     },

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

@@ -78,7 +78,7 @@
                 type="primary"
                 @click="onClickConfirm"
                 :disabled="disabled"
-                >修改并放行</el-button
+                >修改</el-button
               >
               <el-button type="primary" @click="cancel" :disabled="disabled"
                 >返回</el-button