luobang 3 年之前
父节点
当前提交
2dc4a2ac22

+ 1 - 1
build/utils.js

@@ -16,7 +16,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 //  let devModules = ['index','sale']
-let devModules = ['all']
+let devModules = ['index','appoint','sale']
 // let devModules = ['index','appoint','sale','RMS','statisticalReport'];
 // let devModules = ['index','appoint','WMS'];
 // let devModules = ['index','inward']

+ 0 - 1
src/views/SporadicManage/components/oldAreaSporadic/transportOrder/addTransportOrder.vue

@@ -94,7 +94,6 @@
       :wrapperClosable="false"
       modal
       close-on-press-escape
-    
     >
       <el-input
         placeholder="请输入内容"

+ 52 - 18
src/views/appoint/components/saleContract/addSaleOrder.vue

@@ -192,6 +192,7 @@
                   class="textinput111"
                   v-model.number="scope.row.meterNumber"
                   placeholder="(必填)"
+                  :disabled="scope.row.isDisable == 1"
                 ></el-input>
               </template>
               <!-- 分装车数 -->
@@ -558,6 +559,7 @@
       <div class="tablecls">
         <!-- 查询所有的物资 -->
         <dilTable
+          @rowDbClick="rowDbClick1"
           v-bind.sync="option1"
           @radio-change="currentRadioChange"
           :drawer="drawer"
@@ -898,6 +900,14 @@ export default {
     this.getAllsaleMan();
   },
   methods: {
+    rowDbClick1(row) {
+      this.selectedMaterialId = row.materialId;
+      this.selectedMaterialName = row.materialName;
+      this.selectedMaterialSpecification = row.materialSpecification;
+      this.selectedMaterialModel = row.materialModel;
+      this.selectedMaterialCode = row.materialCode;
+      this.makeSureChange();
+    },
     rowDbClick(row) {
       this.materialList1 = [];
       this.materialList1.push(row);
@@ -989,8 +999,6 @@ export default {
           "/api/v1/ams/matchingAddressRecently?receiveId=" + this.consigneeId
         )
         .then(res => {
-          console.log("匹配收货地址");
-          console.log(res);
           const place = res.data.data;
           console.log(place);
           this.saleShipperAddressName =
@@ -1068,7 +1076,9 @@ export default {
         //判断物资是否为盘螺或非定尺
         if (
           e.materialName.includes("盘螺") ||
-          e.materialName.includes("乱尺")
+          e.materialName.includes("乱尺") ||
+          e.materialName.includes("盘元") ||
+          e.materialName.includes("盘圆")
         ) {
           getisPound = 0;
         } else {
@@ -1093,27 +1103,44 @@ export default {
             haveMeter: 0
           };
         } else {
-          var addmap = {
-            materialName: e.materialName,
-            Specification: e.materialSpecification + e.materialModel,
-            materialCode: e.materialCode,
-            orderPlanWeight: null,
-            meterNumber: null,
-            isPound: getisPound,
-            //物资Id
-            materialId: e.materialId,
-            //有米数
-            haveMeter: 1
-          };
+          if (e.materialName.includes("米")) {
+            console.log(e.materialName.replace(/[^0-9]/gi, ""));
+            var addmap = {
+              materialName: e.materialName,
+              Specification: e.materialSpecification + e.materialModel,
+              materialCode: e.materialCode,
+              orderPlanWeight: null,
+              meterNumber: e.materialName.replace(/[^0-9]/gi, ""),
+              isPound: getisPound,
+              //物资Id
+              materialId: e.materialId,
+              //有米数
+              haveMeter: 1,
+              isDisable: 1
+            };
+          } else {
+            var addmap = {
+              materialName: e.materialName,
+              Specification: e.materialSpecification + e.materialModel,
+              materialCode: e.materialCode,
+              orderPlanWeight: null,
+              meterNumber: null,
+              isPound: getisPound,
+              //物资Id
+              materialId: e.materialId,
+              //有米数
+              haveMeter: 1
+            };
+          }
         }
         this.materialList.push(addmap);
       });
       this.materialList1 = [];
       this.table1 = false;
       //初始化查询数据
-      (this.materialNameText = null),
-        (this.materialSpecificationText = null),
-        (this.materialModelText = null);
+      this.materialNameText = null;
+      this.materialSpecificationText = null;
+      this.materialModelText = null;
     },
     //删除物资行数据
     deleteMaterialRow(index, rows) {
@@ -1614,7 +1641,14 @@ export default {
 <style lang="scss" scoped>
 .addSalePlan {
   width: 100%;
+  .el-drawer__body {
+    overflow: auto;
+  }
+  .el-drawer__container ::-webkit-scrollbar {
+    display: none;
+  }
 }
+
 .form-box,
 .from {
   display: flex;

+ 14 - 3
src/views/appoint/components/saleContract/addSaleOrderSteelSend.vue

@@ -57,7 +57,7 @@
                   :fetch-suggestions="querySearch"
                   placeholder="(必填)"
                   :trigger-on-focus="false"
-                  @select="handleSelect"
+                  @select="handleSelect(scope.row, scope.$index)"
                   @blur="checkRelationship(scope.$index)"
                   @change="batchUpdateValue(scope.row, scope.$index)"
                 ></el-autocomplete>
@@ -471,8 +471,17 @@ export default {
       }
     },
     //车牌号弹出层
-    handleSelect(item) {
+    handleSelect(row, index) {
       console.log("获取下拉值!");
+      this.axios
+        .post(
+          "/api/v1/ams/matchingDriverTelRecently?capacityNumber=" +
+            row.capacityNumber
+        )
+        .then(res => {
+          console.log(res);
+          row.driverTel = res.data.data;
+        });
     },
 
     //以下是车牌号边输边查搜索
@@ -559,8 +568,10 @@ export default {
               .then(res => {
                 if (res.data.code == "200") {
                   this.cancel();
+                  this.$message.success("派单成功!");
+                } else {
+                  this.$message.error("派单失败:" + res.data.data);
                 }
-                this.$message.success("派单成功!");
               });
           })
           .catch(() => {

+ 3 - 1
src/views/appoint/components/saleContract/addSaleOrderSteelSendCarrier.vue

@@ -516,8 +516,10 @@ export default {
               .then(res => {
                 if (res.data.code == "200") {
                   this.cancel();
+                  this.$message.success("派单成功!");
+                } else {
+                  this.$message.error("派单失败:" + res.data.data);
                 }
-                this.$message.success("派单成功!");
               });
           })
           .catch(() => {

文件差异内容过多而无法显示
+ 602 - 372
src/views/appoint/components/saleContract/editSaleOrder.vue


+ 3 - 1
src/views/queue/components/qmsEnFacotory/queueFApply.vue

@@ -49,6 +49,8 @@
         </el-table-column>
         <el-table-column prop="orderMaterialNumber" label="物资件数">
         </el-table-column>
+        <el-table-column prop="gatepostName" label="进厂门岗">
+        </el-table-column>
       </el-table>
     </div>
   </div>
@@ -106,7 +108,7 @@ export default {
         columnIndex === 2 ||
         columnIndex === 3 ||
         columnIndex === 4 ||
-        columnIndex === 5
+        columnIndex === 9
       ) {
         const _row = this.spanArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;

+ 4 - 1
src/views/queue/components/qmsEnFacotory/queueFCancel.vue

@@ -46,6 +46,8 @@
         </el-table-column>
         <el-table-column prop="materialModel" label="物资型号">
         </el-table-column>
+        <el-table-column prop="gatepostName" label="进厂门岗">
+        </el-table-column>
       </el-table>
     </div>
   </div>
@@ -107,7 +109,8 @@ export default {
         columnIndex === 1 ||
         columnIndex === 2 ||
         columnIndex === 3 ||
-        columnIndex === 4
+        columnIndex === 4 ||
+        columnIndex === 8
       ) {
         const _row = this.spanArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;

+ 3 - 1
src/views/queue/components/qmsEnFacotory/queueFEnd.vue

@@ -41,6 +41,8 @@
         </el-table-column>
         <el-table-column prop="materialModel" label="物资型号">
         </el-table-column>
+        <el-table-column prop="gatepostName" label="进厂门岗">
+        </el-table-column>
       </el-table>
     </div>
   </div>
@@ -96,7 +98,7 @@ export default {
         columnIndex === 1 ||
         columnIndex === 2 ||
         columnIndex === 3 ||
-        columnIndex === 4
+        columnIndex === 7
       ) {
         const _row = this.spanArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;

+ 116 - 157
src/views/queue/components/qmsEnFacotory/queueFListMonitor.vue

@@ -1,130 +1,119 @@
-// 链表监控
+// 链表监控 // 排队开始
 <template>
   <div class="sale">
     <div class="top">
-      <span>门岗名称:</span>
-      <el-input placeholder="请输入内容" class="input" v-model="inputText" clearable>
-      </el-input>
-      <el-button type="primary" class="btn" @click="onclick(0)">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+      <el-form :inline="true" style="margin-top: 1rem;">
+        <el-form-item>
+          <label class="el-form-item__label" style="width: auto;">车牌号</label>
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="capacityNo"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            class="btn"
+            @click="onclick"
+            style="margin-left: 4px;"
+            clearable
+            ><i class="el-icon-search"></i>查询</el-button
+          >
+        </el-form-item>
+      </el-form>
     </div>
-    <div class="tab">
-      <dilTable v-bind.sync="option" ref="table">
-        <el-table-column fixed="right" label="操作" width="120">
-          <template slot-scope="scope" type="expand">
-            <el-button
-              @click="onclick(1, scope.row)"
-              type="text"
-              size="small"
-              v-if="scope.row.count > 0"
-            >
-              查看详情
-            </el-button>
-            <el-button type="text" size="small" disabled v-else>
-              查看详情
-            </el-button>
-          </template>
-        </el-table-column>
-        <!-- 排队详情下拉框 -->
-        <el-table-column type="expand" width="1">
-          <template slot-scope="props">
-            <el-form label-position="left" inline class="demo-table-expand">
-              <el-form-item v-model="gridId">
-                <div v-if="false">{{ props }}</div>
-                <div class="xq">
-                  <div v-for="(item, i) in queueDetail" :key="i" class="box">
-                    <!-- 头部 -->
-                    <div class="index">
-                      <span>{{ item.listNodeOrder }}</span>
-                    </div>
-                    <div class="img">
-                      <!-- 车辆图片 -->
-                      <div class="image">
-                        <img :src="imgurl" />
-                      </div>
-                    </div>
-                    <div class="time">
-                      <!-- 车牌号 -->
-                      <div class="carNumber">
-                        {{ item.capacityNumber }}
-                      </div>
-                      <!-- 等待时间 -->
-                      <div class="loadTime">
-                        {{ item.minute }}
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </el-form-item>
-            </el-form>
-          </template>
-        </el-table-column>
-      </dilTable>
+    <div class="tabs">
+      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="单拼车辆排队链表" name="first">
+          <el-table
+            :data="tableData1"
+            border
+            style="width: 100%; margin-top: 20px"
+            @selection-change="handleSelectionChange"
+            max-height="500px"
+          >
+            <el-table-column type="index" width="50"> </el-table-column>
+            <el-table-column prop="count" label="排队数" fit> </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>
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="多拼车辆排队链表" name="second">
+          <el-table
+            :data="tableData"
+            :span-method="objectSpanMethod"
+            border
+            style="width: 100%; margin-top: 20px"
+            @selection-change="handleSelectionChange"
+            max-height="500px"
+          >
+            <el-table-column type="selection" width="55"></el-table-column>
+            <el-table-column prop="count" label="排队数"> </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
     </div>
   </div>
 </template>
 <script>
+import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
-      //车图
-      imgurl: require("@/assets/img/car.png"),
+      capacityNo: "",
       inputText: "",
-      option: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/qms/listMonitor?apiId=134",
-      },
-      //记录旧的row对象
-      oldRow: "",
-      //记录上一个展开的点击次数,单数为展开状态,复数为闭合状态
-      oldRowCount: 1,
-      //排队网格id
-      gridId: "",
-      queueDetail: [],
+      activeName: "first",
+      tableData: [],
+      tableData1: [],
+      maplist: [],
+      filterArr1: [],
+      table1: false,
+      //物资选中表格
+      materialList: [],
+      //物资选中暂存
+      materialList1: [],
+      //物资信息查询内容
+      materialNameText: null,
+      materialSpecificationText: null,
+      materialModelText: null
     };
   },
+  watch: {
+    activeName() {}
+  },
+  mounted() {
+    this.getSpellingArray();
+    this.getNoSpellingArray();
+  },
   methods: {
-    onclick(num, row) {
-      if (num == 0) {
-        this.option.requestUrl =
-          "/api/v1/qms/listMonitor?apiId=134&con=" + this.inputText+"&i="+new Date();
-      } else if (num == 1) {
-        console.log(row);
-        // 记录重复点击次数
-        if (this.oldRow === row) {
-          this.oldRowCount += 1;
-        }
-        // 切换当前详情表
-        this.$refs.table.toggleRowExpansion(row);
-        // 打开前关闭上一个详情表
-        if (this.oldRow != "") {
-          if (this.oldRow != row) {
-            if (this.oldRowCount % 2 === 1) {
-              this.$refs.table.toggleRowExpansion(this.oldRow);
-            } else {
-              this.oldRowCount = 1;
-            }
-          } else {
-            this.oldRow = null;
-            return;
-          }
-        }
-        // 重置上一个点击对象
-        this.oldRow = row;
-        this.queueList(row.gatepostId);
+    handleClick() {
+      if (this.activeName == "first") {
+        this.getNoSpellingArray();
+      } else {
+        this.getSpellingArray();
       }
     },
-    queueList(gatepostId) {
-      var mapValue = {
-        gatepostId: gatepostId,
-      };
-      console.log(mapValue);
-      this.axios.post("/api/v1/qms/getListQueueMes", mapValue).then((res) => {
-        this.queueDetail = res.data.data;
-      });
+    getNoSpellingArray() {
+      this.axios
+        .post("/api/v1/qms/listMonitor?isSpelling=0&i=" + new Date())
+        .then(res => {
+          this.tableData1 = res.data.data;
+        });
     },
-  },
+    getSpellingArray() {
+      this.axios
+        .post("/api/v1/qms/listMonitor?apiId=473&isSpelling=1&i=" + new Date())
+        .then(res => {
+          this.tableData = res.data.data;
+        });
+    },
+    onclick() {
+      this.$message.info("未开通");
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>
@@ -135,56 +124,26 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 40px;
-    .input{
-        width: 250px;
-        margin-right: 20px;
-    }
-  }
-  .tab {
-    .xq {
+    .el-form {
       display: flex;
-      .box {
-        padding-right: 20px;
-        .index {
-          display: flex;
-          justify-content: center;
-          span {
-            background-color: #87ceeb;
-            display: inline-block;
-            width: 20px;
-            height: 20px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            border-radius: 50%;
-            color: #fff;
-          }
-        }
-        .img {
-          display: flex;
-          justify-content: center;
-        }
-        .time {
-          display: flex;
-          color: #fff;
-          font-size: 12px;
-          .carNumber {
-            background-color: #7eb9ff;
-            height: 20px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-          }
-          .loadTime {
-            background-color: #3e62d8;
-            height: 20px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-          }
-        }
+      justify-content: center;
+      align-items: center;
+      .el-form-item__label {
+        align-items: center;
+        line-height: 80px;
       }
     }
   }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+  .tabs {
+    margin-left: 20px;
+    margin-top: 10px;
+    .tabs /deep/ .el-tabs__nav {
+      font-size: 40px;
+    }
+  }
 }
-</style>
+</style>

+ 5 - 3
src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -121,6 +121,8 @@
             </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">
@@ -172,6 +174,8 @@
             </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">
@@ -437,9 +441,7 @@ export default {
       this.axios.post("/api/v1/qms/allowEnFactory", map).then(res => {
         if (res.data.code == "200") {
           this.$message.success("放行成功,等待进厂");
-          this.option1.requestUrl =
-            "/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=0&i=" +
-            new Date();
+          this.getNoSpellingArray();
           this.getSpellingArray();
         }
       });

部分文件因为文件数量过多而无法显示