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

build/utils.js

@@ -20,6 +20,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "statisticalReport", "inward"];
 // let devModules = ["index", "WMS", "inward"];
 let devModules = ["all"];
+//let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS"];
 
 if (pathSrc.indexOf("node_modules") > -1) {
   devModules = require("../../../cors.js").devModules;

config/index.js

@@ -66,7 +66,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:80",
-    // target: "http://localhost:8080",
+    //target: "http://localhost:8080",
     // target: "http://192.168.1.101:8080",
     ws: true,
     pathRewrite: {
@@ -74,8 +74,8 @@ let proxyTable = {
     }
   },
   "/views/api/v1": {
-    target: "http://172.16.33.166:80",
-    // target: "http://192.168.1.109:8080",
+    //target: "http://172.16.33.166:80",
+    target: "http://192.168.1.109:8080",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"

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

@@ -166,6 +166,8 @@
         border
         style="width: 100%"
         highlight-current-row
+        ref="materialTableTop"
+        id="table"
       >
         <el-table-column
           v-for="(item, i) in materialTableTop"
@@ -185,6 +187,10 @@
                   class="textinput111"
                   v-model.number="scope.row.orderPlanWeight"
                   placeholder="(必填)"
+                  :id="'input' + scope.$index"
+                  @keyup.up.native="clicks(scope.$index)"
+                  @keyup.down.native="clickx(scope.$index)"
+                  @keyup.enter.native="singleDistribute"
                 ></el-input>
               </template>
               <!-- 米数 -->
@@ -315,6 +321,14 @@
                   >更改</el-button
                 >
               </template>
+              <!--规格型号-->
+              <template v-if="item.prop == 'Specification'">
+                <el-input
+                  style="width: 120px"
+                  class="textinput"
+                  v-model.number="scope.row.Specification"
+                ></el-input>
+              </template>
               <!-- 物资件数 -->
               <template v-if="item.prop == 'orderPlanWeight'">
                 <el-input
@@ -887,7 +901,8 @@ export default {
         {
           prop: "Specification",
           label: "规格型号",
-          width: "140px"
+          width: "140px",
+          slot: true
         },
         {
           prop: "orderPlanWeight",
@@ -946,7 +961,9 @@ export default {
       ignoreSaleOrderConsigneeTel: 0,
       restaurants: [],
       saleAreaId: null,
-      isNiTui: 0
+      isNiTui: 0,
+      datalistindex: 0,
+      temporarylist:[],
     };
   },
   created() {
@@ -1969,7 +1986,7 @@ export default {
       }
     },
     // 确定
-    makeSure() {
+    async makeSure() {
       if (this.selectionList.length == 0) {
         this.$message.warning("请先填写具体信息");
         return;
@@ -1981,6 +1998,18 @@ export default {
           i++;
         }
       });
+      let flag=0
+      await this.axios
+        .post("/api/v1/ams/queryFormat",this.selectionList)
+        .then(res=>{
+          if (res.data.code=="500"){
+            flag=1
+          }
+        })
+      if (flag== 1){
+        this.$message.error("规格型号有问题，请重新输入");
+        return;
+      }
       if (i != 0) {
         this.$message.error("件数必填且请输入正整数");
         return;
@@ -2017,10 +2046,31 @@ export default {
       this.orderMakeSure = true;
     },
     //发送请求
-    sendRequest() {
+    async sendRequest() {
       this.orderMakeSure = false;
       //是否还有件数未填写
       var orderPlanWeightAllFill = 0;
+      //根据规格型号与物资名称获取对应的物资ID||确认规格型号格式是否正确
+      //先把暂存区的数据清空
+      this.temporarylist=[]
+      let flag=0
+      await this.axios
+        .post("/api/v1/ams/queryMaterial",this.selectionList)
+        .then(res=>{
+          if (res.data.code === "500"){
+            flag=1
+          }
+          console.log(res.data.code)
+          //给暂存区的数据赋值
+          this.temporarylist=res.data.data
+          console.log("以下是查询出来的数据")
+          console.log(res.data.data)
+        })
+      if (flag===1){
+        this.$message.error("规格型号不对")
+        return
+      }
+      this.selectionList=this.temporarylist
       //初始化maplist
       var mapList = [];
       this.selectionList.forEach(item => {
@@ -2105,6 +2155,44 @@ export default {
           done();
         })
         .catch(_ => {});
+    },
+    //点击事件（上）
+    clicks(index){
+      console.log(index)
+      console.log(this.materialList)
+      console.log(this.materialList.length-1)
+      console.log('clicks=e',arguments);
+      if (index==0){
+        console.log("向上1")
+        //this.datalistindex=this.materialTableTop.length-1
+        document.getElementById("input" + (this.materialList.length-1)).focus()
+      }else {
+        console.log("向上2")
+        //this.$refs.materialTableTop.bodyWrapper.scrollTop=index
+        document.getElementById("input" + (index-1)).focus()
+      }
+
+    },
+    //点击事件(下)
+    clickx(index){
+      console.log(index)
+      console.log(this.materialList)
+      console.log(this.materialList.length-1)
+      if (index ==this.materialList.length-1){
+        console.log("向下1")
+        document.getElementById("input" + 0).focus()
+      }else {
+        console.log("向下2")
+        //this.datalistindex+=1
+        //this.$refs.materialTableTop.bodyWrapper.scrollTop=(index+1)*height
+        //var tbl=document.getElementById("table").childNodes[0]
+        //tbl.childNodes[len].childNodes[0].childNodes[0].focus()children[3]
+        //const rowlist=this.$refs.materialTableTop.$el.children[3].children[1].children[0]
+          //.children[1].children[len].children[3].children[0].children[0].children[0].focus()
+        //console.log(rowlist)
+        var nextInput = document.getElementById("input" + (index + 1));
+        nextInput.focus()
+      }
     }
   }
 };

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

@@ -322,6 +322,14 @@
                   v-model.number="scope.row.orderPlanWeight"
                 ></el-input>
               </template>
+              <!--规格型号-->
+              <template v-if="item.prop=='Specification'">
+                <el-input
+                  class="textinput"
+                  v-model.number="scope.row.Specification"
+                  style="width:120px"
+                ></el-input>
+              </template>
               <!-- 米数 -->
               <template v-if="item.prop == 'meterNumber'">
                 <el-input
@@ -705,7 +713,7 @@ export default {
         {
           prop: "Specification",
           label: "规格型号",
-          width: "140"
+          width: "140",
         },
         {
           prop: "orderPlanWeight",
@@ -841,7 +849,8 @@ export default {
         {
           prop: "Specification",
           label: "规格型号",
-          width: "140"
+          width: "140",
+          slot: true
         },
         {
           prop: "orderPlanWeight",
@@ -898,7 +907,9 @@ export default {
       //收款公司
       saleOrderReceiveCustomer: null,
       //是否忽视收货客户电话字段
-      ignoreSaleOrderConsigneeTel: 0
+      ignoreSaleOrderConsigneeTel: 0,
+      //暂时存取的数据
+      temporarylist: [],
     };
   },
   created() {
@@ -1873,7 +1884,7 @@ export default {
       }
     },
     // 确定
-    makeSure() {
+    async makeSure() {
       if (this.selectionList.length == 0) {
         this.$message.warning("请先填写具体信息");
         return;
@@ -1885,6 +1896,20 @@ export default {
           i++;
         }
       });
+      let s=0
+      //确认规格型号格式是否正确
+      await this.axios
+        .post("/api/v1/ams/queryFormat",this.selectionList)
+        .then(res=>{
+          if (res.data.code=="500"){
+            s=1
+          }
+        })
+      console.log("这是获取到的数据")
+      if (s== 1){
+        this.$message.error("规格型号有问题，请重新输入");
+        return;
+      }
       if (i != 0) {
         this.$message.error("件数必填且请输入正整数");
         return;
@@ -1920,8 +1945,37 @@ export default {
       });
       this.orderMakeSure = true;
     },
+    async getlist(){
+      let res=await this.axios
+        .post("/api/v1/ams/queryMaterial",this.selectionList)
+      this.selectionList=res.data.data
+      console.log("这是查询出来的")
+      console.log(res.data.data)
+      console.log("这是修改后的数据")
+      console.log(this.selectionList)
+    },
     //发送请求
-    sendRequest() {
+    async sendRequest() {
+      //根据规格型号与物资名称获取对应的物资ID||确认规格型号格式是否正确
+      //先把暂存区的数据清空
+      this.temporarylist=[]
+      let flag=0
+      await this.axios
+        .post("/api/v1/ams/queryMaterial",this.selectionList)
+        .then(res=>{
+          if (res.data.code === "500"){
+            flag=1
+          }
+          console.log(res.data.code)
+          //给暂存区的数据赋值
+          this.temporarylist=res.data.data
+          console.log("以下是查询出来的数据")
+          console.log(res.data.data)
+        })
+      if (flag===1){
+        this.$message.error("规格型号不对")
+        return
+      }
       //先调删除订单接口
       this.axios
         .post(
@@ -1934,8 +1988,10 @@ export default {
             //是否还有件数未填写
             var orderPlanWeightAllFill = 0;
             //初始化maplist
+            this.selectionList=this.temporarylist
+            console.log("以下是修改过后的数据")
+            console.log(this.selectionList)
             var mapList = [];
-            console.log(this.selectionList);
             this.selectionList.forEach(item => {
               if (!item.orderPlanWeight) {
                 orderPlanWeightAllFill++;

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

@@ -128,6 +128,8 @@
             </el-table-column>
             <el-table-column prop="materialName" label="物资名称">
             </el-table-column>
+            <el-table-column prop="steelMeter" label="钢材长度">
+            </el-table-column>
             <el-table-column prop="materialSpecification" label="规格型号">
             </el-table-column>
             <el-table-column prop="materialNumber" label="物资件数">
@@ -183,6 +185,8 @@
             </el-table-column>
             <el-table-column prop="materialName" label="物资名称">
             </el-table-column>
+            <el-table-column prop="steelMeter" label="钢材长度">
+            </el-table-column>
             <el-table-column prop="materialSpecification" label="规格型号">
             </el-table-column>
             <el-table-column prop="materialNumber" label="物资件数">
@@ -432,7 +436,6 @@ export default {
         columnIndex === 0 ||
         columnIndex === 1 ||
         columnIndex === 2 ||
-        columnIndex === 7 ||
         columnIndex === 8 ||
         columnIndex === 9 ||
         columnIndex === 10 ||

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckSteelDetails.vue

@@ -386,6 +386,7 @@ export default {
       }
     },
     onclick() {
+
       console.log("查询待定值");
       let startTime = null;
       let endTime = null;