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

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

@@ -140,7 +140,7 @@
       </el-form-item>
       <el-form-item>
         <label class="el-form-item__label" style="width: auto;"
-        >可装货时间</label
+          >可装货时间</label
         >
         <el-date-picker
           class="textinput3"
@@ -315,10 +315,12 @@
                 >
                 </el-input>
                 <!--更改-->
-                <i class="el-icon-edit"
-                   @click="changeMaterial(scope.$index)"
-                   style="font-size: 20px"
-                   v-if="isCellClick == 1"></i>
+                <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,10 +374,11 @@
                 >
                 </el-input>
                 <!--增加-->
-                <i class="el-icon-folder-add"
-                   @click="ondrawer(scope.row, scope.$index)"
-                   v-if="isCellClick == 1"
-                   style="font-size: 20px"
+                <i
+                  class="el-icon-folder-add"
+                  @click="ondrawer(scope.row, scope.$index)"
+                  v-if="isCellClick == 1"
+                  style="font-size: 20px"
                 ></i>
               </template>
               <!-- 收货日期 -->
@@ -412,7 +415,12 @@
           </template>
         </el-table-column>
         <!-- 操作列 -->
-        <el-table-column fixed="right" label="操作" width="200" v-if="isCellClick == 1">
+        <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)"
@@ -873,6 +881,14 @@ export default {
         {
           values1: "dgsm",
           label1: "四川达钢商贸有限公司"
+        },
+        {
+          values1: "jxjl",
+          label1: "江西久隆贸易有限公司"
+        },
+        {
+          values1: "hnht",
+          label1: "海南瀚途贸易有限公司"
         }
       ],
       values1: "dzgt",
@@ -962,7 +978,7 @@ export default {
       saleAreaId: null,
       isNiTui: 0,
       datalistindex: 0,
-      temporarylist:[],
+      temporarylist: []
     };
   },
   created() {
@@ -1934,15 +1950,15 @@ 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
+      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;
           }
         }
       }
@@ -2011,15 +2027,15 @@ export default {
           i++;
         }
       });
-      let flag=0
+      let flag = 0;
       await this.axios
-        .post("/api/v1/ams/queryFormat",this.selectionList)
-        .then(res=>{
-          if (res.data.code=="500"){
-            flag=1
+        .post("/api/v1/ams/queryFormat", this.selectionList)
+        .then(res => {
+          if (res.data.code == "500") {
+            flag = 1;
           }
-        })
-      if (flag== 1){
+        });
+      if (flag == 1) {
         this.$message.error("规格型号有问题，请重新输入");
         return;
       }
@@ -2065,25 +2081,25 @@ export default {
       var orderPlanWeightAllFill = 0;
       //根据规格型号与物资名称获取对应的物资ID||确认规格型号格式是否正确
       //先把暂存区的数据清空
-      this.temporarylist=[]
-      let flag=0
+      this.temporarylist = [];
+      let flag = 0;
       await this.axios
-        .post("/api/v1/ams/queryMaterial",this.selectionList)
-        .then(res=>{
-          if (res.data.code === "500"){
-            flag=1
+        .post("/api/v1/ams/queryMaterial", this.selectionList)
+        .then(res => {
+          if (res.data.code === "500") {
+            flag = 1;
           }
-          console.log(res.data.code)
+          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.temporarylist = res.data.data;
+          console.log("以下是查询出来的数据");
+          console.log(res.data.data);
+        });
+      if (flag === 1) {
+        this.$message.error("规格型号不对");
+        return;
       }
-      this.selectionList=this.temporarylist
+      this.selectionList = this.temporarylist;
       //初始化maplist
       var mapList = [];
       this.selectionList.forEach(item => {
@@ -2170,41 +2186,42 @@ export default {
         .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")
+    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")
+        document
+          .getElementById("input" + (this.materialList.length - 1))
+          .focus();
+      } else {
+        console.log("向上2");
         //this.$refs.materialTableTop.bodyWrapper.scrollTop=index
-        document.getElementById("input" + (index-1)).focus()
+        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")
+    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()
+        //.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()
+        nextInput.focus();
       }
     }
   }

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

@@ -255,7 +255,9 @@ export default {
       shipperId: 1,
       receivingCompany: [
         "四川省达州钢铁集团有限责任公司",
-        "四川达钢商贸有限公司"
+        "四川达钢商贸有限公司",
+        "江西久隆贸易有限公司",
+        "海南瀚途贸易有限公司"
       ],
       option: {
         // 表格请求数据的地址

src/views/sale/components/saleSelfMachine/printReceipt.vue

@@ -3,9 +3,10 @@
     <div id="pdfDom1">
     <div id="pdfDom" v-for="(item, index) in dataList" :key="index">
       <div class="blank"></div>
+
       <div class="title">
-        <h5 align="center">{{ shippername }}  物资送货单</h5>
-<!--        <h5 align="center">物资送货单</h5>-->
+        <h5 align="center">{{ shippername }} 物资送货单</h5>
+        <!--        <h5 align="center">物资送货单</h5>-->
       </div>
       <div>
         <!-- tablePart0 -->
@@ -50,6 +51,7 @@
             <td>{{ item.makeDate }}</td>
           </tr>
         </table>
+
         <!-- tablePart2 -->
         <table
           border="1"
@@ -84,9 +86,6 @@
           </tr>
         </table>
 
-
-
-
         <!-- tablePart4 -->
         <table
           border="0"
@@ -104,8 +103,7 @@
           </tr>
         </table>
 
-
-              <!-- tablePart9 -->
+        <!-- tablePart9 -->
         <table
           border="1"
           cellpadding="10"
@@ -116,13 +114,11 @@
         >
           <tr>
             <th style="width: 28.5%">备注</th>
-            <td style="width: 71.5%">{{note}}</td>
+            <td style="width: 71.5%">{{ note }}</td>
           </tr>
         </table>
       </div>
 
-
-
       <div>
         <!-- tablePart6 margin-top: 10px-->
         <table
@@ -140,9 +136,9 @@
             <td style="width: 30.5%">{{ consigeeName }}</td>
           </tr>
         </table>
-</div>
+      </div>
 
-<!--          <div>
+      <!--          <div>
         &lt;!&ndash; tablePart6 &ndash;&gt;
         <table
           border="0"
@@ -174,7 +170,7 @@
           </tr>
         </table>
       </div>
-<!--      <div>
+      <!--      <div>
         &lt;!&ndash; tablePart6 &ndash;&gt;
         <table
           border="0"
@@ -227,8 +223,8 @@ export default {
           materialModel: "",
           materialNumber: 0,
           materialWeight: 0,
-          makeDate: "",
-        },
+          makeDate: ""
+        }
       ],
       carrierName: "",
       province: "",
@@ -240,7 +236,7 @@ export default {
       month: new Date().getMonth() + 1,
       date: new Date().getDate(),
       htmlTitle: "客户换票送货单",
-      note: "",
+      note: ""
       dataList:['1','2','3']
     };
   },
@@ -261,7 +257,7 @@ export default {
       let orderNumber = this.$route.query.orderNumber;
       this.axios
         .post("/api/v1/tms/getDeliveryOrder?orderNumber=" + orderNumber)
-        .then((res) => {
+        .then(res => {
           console.log(res);
           this.orderNumber = res.data.orderNumber;
           this.carrierName = res.data.carrierName;
@@ -278,13 +274,13 @@ export default {
           this.town = res.data.town;
           this.deliveryAddress = res.data.deliveryAddress;
           this.deliveryOrderMaterialList = res.data.deliveryOrderMaterialList;
-          this.note=res.data.note;
+          this.note = res.data.note;
         });
     },
     backScan() {
       this.$router.go(-2);
-    },
-  },
+    }
+  }
 };
 </script>
 

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelAllReport.vue

@@ -83,13 +83,12 @@
         :span-method="objectSpanMethod"
         ref="tableRef"
         border
-        stripe
         style="width: 100%; margin-top: 20px"
-        max-height="600px"
+        max-height="650px"
         @cell-click="cellClik"
         @row-click="rowClick"
         :row-style="{ height: '30px' }"
-        :cell-style="{ fontWeight: '700' }"
+        :cell-style="{ fontWeight: '500' }"
       >
         <el-table-column
           width="50"
@@ -120,7 +119,6 @@
               :fetch-suggestions="querySearchCarrier"
               placeholder="请输入承运商"
               @select="handleSelectCarrier(scope.row, scope.$index)"
-              :disabled="scope.row.isCarrierShow != 1"
             >
             </el-autocomplete>
             <el-button
@@ -145,7 +143,6 @@
               :fetch-suggestions="querySearch"
               placeholder="请输入车牌号"
               @select="handleSelect(scope.row, scope.$index)"
-              :disabled="scope.row.isCapacityShow != 1"
             ></el-autocomplete>
             <el-button
               @click="updateCapacity(scope.row)"
@@ -181,7 +178,6 @@
             </button>
             <input
               v-model="scope.row.materialNum"
-              disabled
               style="width:40px;height: 40px;font-size:16px;line-height: 40px;text-align: center;"
             />
             <el-button
@@ -202,7 +198,6 @@
               style="width:280px"
               v-model="scope.row.addressPlace"
               placeholder="请输入收货地址"
-              :disabled="scope.row.isAddressShow != 1"
             ></el-input>
             <el-button
               @click="updateAddress(scope.row)"
@@ -259,7 +254,6 @@
               style="width:120px"
               v-model="scope.row.capacityTel"
               placeholder="请输入电话号码"
-              :disabled="scope.row.isTelShow != 1"
             ></el-input>
             <el-button
               @click="updateDriverTel(scope.row)"