zyf před 2 roky
rodič
revize
377a9df2f0

+ 2 - 2
build/utils.js

@@ -19,8 +19,8 @@ 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 = ["all"];
-//let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS"];
+//let devModules = ["all"];
+let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS"];
 
 if (pathSrc.indexOf("node_modules") > -1) {
   devModules = require("../../../cors.js").devModules;

+ 2 - 2
config/index.js

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

+ 27 - 14
src/views/appoint/components/saleContract/addSaleOrder.vue

@@ -314,12 +314,11 @@
                   disabled
                 >
                 </el-input>
-                <el-button
-                  type="primary"
-                  @click="changeMaterial(scope.$index)"
-                  v-if="isCellClick == 1"
-                  >更改</el-button
-                >
+                <!--更改-->
+                <i class="el-icon-edit"
+                   @click="changeMaterial(scope.$index)"
+                   style="font-size: 20px"
+                   v-if="isCellClick == 1"></i>
               </template>
               <!--规格型号-->
               <template v-if="item.prop == 'Specification'">
@@ -372,12 +371,12 @@
                   disabled
                 >
                 </el-input>
-                <el-button
-                  type="primary"
-                  @click="ondrawer(scope.row, scope.$index)"
-                  v-if="isCellClick == 1"
-                  >选择</el-button
-                >
+                <!--增加-->
+                <i class="el-icon-folder-add"
+                   @click="ondrawer(scope.row, scope.$index)"
+                   v-if="isCellClick == 1"
+                   style="font-size: 20px"
+                ></i>
               </template>
               <!-- 收货日期 -->
               <!-- <template v-if="item.prop == 'saleDateOfReceipt'">
@@ -413,7 +412,7 @@
           </template>
         </el-table-column>
         <!-- 操作列 -->
-        <el-table-column fixed="right" label="操作" width="200">
+        <el-table-column fixed="right" label="操作" width="200" v-if="isCellClick == 1">
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="deleteRow(scope.$index, selectionList)"
@@ -435,7 +434,7 @@
             >
           </template>
         </el-table-column>
-        <el-table-column fixed="right" width="80">
+        <el-table-column fixed="right" width="80" v-if="isCellClick == 1">
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="copyRowfluAll(scope.$index, scope.row)"
@@ -1933,6 +1932,20 @@ export default {
     },
     //确定收货地址事件
     addAddressClick() {
+      //不管是外层还是内层都需要修改,如果存在都需要修改收货客户的电话
+      //定义一个正则表达式判断是否有电话
+      var est=/\d{11}/g
+      var string2=this.place.match(est)
+      console.log("-----------这是抓取到的数据----------")
+      console.log(string2)
+      if (string2 != null){
+        for(i=0;i<string2.length;i++){
+          var reg=/^1[3456789]\d{9}$/
+          if(reg.test(string2[i])){
+            this.saleOrderConsigneeTel=string2
+          }
+        }
+      }
       if (this.inOrOut % 2 == 0) {
         for (
           var i = this.row.index;

+ 70 - 15
src/views/appoint/components/saleContract/editSaleOrder.vue

@@ -183,6 +183,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="createACar"
                 ></el-input>
               </template>
               <!-- 米数 -->
@@ -308,12 +312,11 @@
                   disabled
                 >
                 </el-input>
-                <el-button
-                  type="primary"
-                  @click="changeMaterial(scope.$index)"
-                  v-if="isCellClick == 1"
-                  >更改</el-button
-                >
+                <!--更改-->
+                <i class="el-icon-edit"
+                   @click="changeMaterial(scope.$index)"
+                   style="font-size: 20px"
+                   v-if="isCellClick == 1"></i>
               </template>
               <!-- 物资件数 -->
               <template v-if="item.prop == 'orderPlanWeight'">
@@ -366,12 +369,12 @@
                   disabled
                 >
                 </el-input>
-                <el-button
-                  type="primary"
-                  @click="ondrawer(scope.row, scope.$index)"
-                  v-if="isCellClick == 1"
-                  >选择</el-button
-                >
+                <!--增加-->
+                <i class="el-icon-folder-add"
+                   @click="ondrawer(scope.row, scope.$index)"
+                   v-if="isCellClick == 1"
+                   style="font-size: 20px"
+                ></i>
               </template>
               <!-- 收货客户电话号码 -->
               <template v-if="item.prop == 'saleOrderConsigneeTel'">
@@ -397,7 +400,8 @@
           </template>
         </el-table-column>
         <!-- 操作列 -->
-        <el-table-column fixed="right" label="操作" width="200">
+        <el-table-column fixed="right" label="操作" width="200"
+                         v-if="isCellClick == 1">
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="deleteRow(scope.$index, selectionList)"
@@ -419,7 +423,7 @@
             >
           </template>
         </el-table-column>
-        <el-table-column fixed="right" width="80">
+        <el-table-column fixed="right" width="80" v-if="isCellClick == 1">
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="copyRowfluAll(scope.$index, scope.row)"
@@ -1827,6 +1831,20 @@ export default {
     },
     //确定收货地址事件
     addAddressClick() {
+      //不管是外层还是内层都需要修改,如果存在都需要修改收货客户的电话
+      //定义一个正则表达式判断是否有电话
+      var est=/\d{11}/g
+      var string2=this.place.match(est)
+      console.log("-----------这是抓取到的数据----------")
+      console.log(string2)
+      if (string2 != null){
+        for(i=0;i<string2.length;i++){
+          var reg=/^1[3456789]\d{9}$/
+          if(reg.test(string2[i])){
+            this.saleOrderConsigneeTel=string2
+          }
+        }
+      }
       if (this.inOrOut % 2 == 0) {
         for (
           var i = this.row.index;
@@ -2069,8 +2087,45 @@ export default {
         })
         .catch(_ => {});
     },
+    CloseClick() {},
+    //点击事件(上)
+    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()
+      }
 
-    CloseClick() {}
+    },
+    //点击事件(下)
+    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()
+      }
+    }
   }
 };
 </script>