修改bug

build/utils.js

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

config/index.js

@@ -65,7 +65,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:8080",
-    // target: "http://192.168.1.119:8080",
+    // target: "http://192.168.1.105:8019",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

src/components/DilCommonUI/packages/table/src/table.vue

@@ -7,7 +7,6 @@
       row-key="ROW_ID"
       :stripe="stripe"
       :border="border"
-      :row-class-name="tableRowClassName"
       :cell-class-name="cellClassName"
       :height="height"
       :highlight-current-row="highlightCurrentRow"

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

@@ -127,10 +127,10 @@
               </template>
               <!-- 米数 -->
               <template v-if="item.prop == 'meterNumber'">
-                <el-input
+                <el-input v-if="scope.row.haveMeter==1"
                   class="textinput111"
                   v-model.number="scope.row.meterNumber"
-                  placeholder="(非必填)"
+                  placeholder="(必填)"
                 ></el-input>
               </template>
               <!-- 分装车数 -->
@@ -228,7 +228,7 @@
               </template>
               <!-- 米数 -->
               <template v-if="item.prop == 'meterNumber'">
-                <el-input
+                <el-input v-if="scope.row.haveMeter==1"
                   class="textinput"
                   v-model.number="scope.row.meterNumber"
                 ></el-input>
@@ -819,7 +819,9 @@ export default {
         }else{
           getisPound = 1;
         }
-        var addmap = {
+        //若物资为带有盘螺、盘圆、盘元，默认无米数
+        if(e.materialName.includes("盘螺")||e.materialName.includes("盘圆")||e.materialName.includes("盘元")){
+          var addmap = {
           materialName: e.materialName,
           Specification: e.materialSpecification+e.materialModel,
           materialCode: e.materialCode,
@@ -828,7 +830,23 @@ export default {
           isPound: getisPound,
           //物资Id
           materialId: e.materialId,
-        };
+          //无米数
+          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
+          };
+        }
         this.materialList.push(addmap);
       });
       this.materialList1 = [];
@@ -878,7 +896,7 @@ export default {
     addMaterialToSaleOrder(){
       if(this.materialList.length==0){
         this.$message.warning("请至少为这一车添加一个物资！");
-      }else if(!this.saleShipperAddressName){
+      }else if(!this.saleShipperAddressName&&this.values=='no'){
         this.$message.warning("收货地址未填写！");
       }else if(this.materialList.length==1&&this.materialList[0].carNumber!=null){
           var eachOrderPlanWeight = this.materialList[0].orderPlanWeight/this.materialList[0].carNumber;
@@ -898,6 +916,7 @@ export default {
             saleDateOfReceipt: this.saleDateOfReceipt,
             saleOrderConsigneeTel: this.saleOrderConsigneeTel,
             materialId: e.materialId,
+            haveMeter: e.haveMeter
           };
           this.selectionList.push(addmap);
           //最大车序号加1
@@ -923,6 +942,7 @@ export default {
               saleDateOfReceipt: this.saleDateOfReceipt,
               saleOrderConsigneeTel: this.saleOrderConsigneeTel,
               materialId: e.materialId,
+              haveMeter: e.haveMeter
             };
             this.selectionList.push(addmap);
           });
@@ -979,6 +999,13 @@ export default {
         this.selectionList[this.indexChangeMaterial].Specification=this.selectedMaterialSpecification+this.selectedMaterialModel;
         this.selectionList[this.indexChangeMaterial].materialCode=this.selectedMaterialModel;
         this.selectionList[this.indexChangeMaterial].isPound=getisPound;
+        //确定更改的物资有无米数
+        if(this.selectedMaterialName.includes("盘螺")||this.selectedMaterialName.includes("盘圆")||this.selectedMaterialName.includes("盘元")){
+          this.selectionList[this.indexChangeMaterial].haveMeter = 0;
+          this.selectionList[this.indexChangeMaterial].meterNumber = null;
+        }else{
+          this.selectionList[this.indexChangeMaterial].haveMeter = 1;
+        }
         //重新初始化
         this.indexChangeMaterial = null;
         this.selectedMaterialId = null;

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

@@ -62,15 +62,21 @@
 
               <!-- 承运商 -->
               <template v-if="item.prop == 'carrierName'">
-                 <el-select v-model="scope.row.carrierName" placeholder="请选择"  
-                 @change="batchUpdateValue(scope.row,scope.$index)">
-                  <el-option
-                    v-for="item in carrierNameOptions[scope.$index]"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
+                <el-autocomplete
+                    class="inline-input"
+                    v-model="scope.row.carrierName"
+                    :fetch-suggestions="querySearch1"
+                    placeholder="请输入承运商名称"
+                    :trigger-on-focus="false"
+                    @change="batchUpdateValue(scope.row,scope.$index)"
+                    @select="handleSelect1"
+                  >
+                    <template slot-scope="{ item }">
+                      <div class="name" v-if="item.carrierName">
+                        {{ item.carrierName }}
+                      </div>
+                    </template>
+                  </el-autocomplete>
               </template>
 
               <!-- 物资件数 -->
@@ -163,6 +169,8 @@ export default {
       pos:0,
       //加载
       selectLineLoading:false,
+      //所有选中承运商Id和承运商名称暂存
+      carrierIdAndName: [],
       //承运商下拉框中的值
       carrierNameOptions:[],
       //当前车序号物资
@@ -299,12 +307,8 @@ export default {
                 saleDateOfReceipt: e.receiptDate,
                 saleOrderConsignee: e.saleOrderConsignee,
                 saleOrderConsigneeTel: e.saleOrderConsigneeTel,
-                priceValue: null,
-                priceId: null,
             };
             this.selectionList.push(addmap);
-            //填充承运商下拉框
-            this.carrierNameOptions.push(e.carrierAndPriceList);
             //调用记录每一行的合并数的方法
             this.getSpanArr(this.selectionList);
             //初始化每个车的线路
@@ -312,6 +316,40 @@ export default {
         });
       });
     },
+
+    //承运商弹出层
+    handleSelect1(item) {
+      let carrierIdAndNameItem = {
+        carrierId : item.carrierId,
+        carrierName : item.carrierName
+      }
+      this.carrierIdAndName.push(carrierIdAndNameItem);
+    },
+    //以下是承运商边输边查搜索
+    querySearch1(queryString, cb) {
+      this.axios
+        .post("/api/v1/uc/getCarrierMesByLike?index=" + queryString)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurants = res.data.data;
+            var results = queryString
+              ? restaurants.filter(this.createFilter1(queryString))
+              : restaurants;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    createFilter1(queryString) {
+      return (restaurants) => {
+        return (
+          restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
+          -1
+        );
+      };
+    },
+    //以上是承运商边输边查搜索
+
     onInput(val){
       if(!isNumber(val)){
         this.$message.warning('重量/电话号码请输入数字')
@@ -359,7 +397,7 @@ export default {
         })
         .catch(() => {this.$message({ type: "info", message: "已取消删除",});});
     },
-    //失焦事件后确定车牌号与承运商是否有绑定关系
+    //确定车牌号与承运商是否有绑定关系
     checkRelationship(index){
       if(this.selectionList[index].carrierId!=null){
         //暂存车牌号
@@ -388,19 +426,7 @@ export default {
     },
     //车牌号弹出层
     handleSelect(item) {
-      console.log("item")
-        // let mapValue = {
-        //   capacityNumber:item.capacityNumber,
-        //   carrierId:this.receiveCarrierId,
-        //   carrierName:this.receiveCarrierName
-        // }
-        // this.axios
-        // .post("/api/v1/uc/isInCapacityCarrier", mapValue)
-        // .then((res)=>{
-        //   if(res.data.code=="201"){
-        //     this.bindRelationship(mapValue);
-        //   }
-        // });
+      console.log("获取下拉值！")
     },
 
     //以下是车牌号边输边查搜索
@@ -453,7 +479,13 @@ export default {
             .then(() => {
               var mapList = [];
               for(var i=0;i<this.spanArr.length;i++){
-                if(this.spanArr[i]>0){
+                  if(this.spanArr[i]>0){
+                  //从所有选中承运商Id和承运商名称暂存中取出当前行的承运商Id
+                  this.carrierIdAndName.forEach((item) => {
+                    if(this.selectionList[i].carrierName==item.carrierName){
+                      this.selectionList[i].carrierId = item.carrierId;
+                    }
+                  })
                   var mapItem = {
                   //车牌号
                   capacityNumber : null,
@@ -463,14 +495,11 @@ export default {
                   carrierId : 0,
                   //线路Id
                   lineId : 0,
-                  //运输单价Id
-                  priceId : 0
                 }
                 mapItem.capacityNumber = this.selectionList[i].capacityNumber,
                 mapItem.saleOrderMaterialId = this.selectionList[i].saleOrderMaterialId,
                 mapItem.carrierId = this.selectionList[i].carrierId,
                 mapItem.lineId = this.selectionList[i].lineId,
-                mapItem.priceId = this.selectionList[i].priceId
                 mapList.push(mapItem);
                 }
               }
@@ -494,23 +523,9 @@ export default {
 
     //批量修改内层值
     batchUpdateValue(row,index){
-      //单价以及单价Id
-        var priceValue = null;
-        var priceId = null;
-        var carrierName = null;
-        this.carrierNameOptions[index].forEach((e) => {
-          if (row.carrierName == e.value) {
-            priceValue = e.priceValue;
-            priceId = e.priceId;
-            carrierName = e.label;
-          }
-        });
         for(var i=index;i<this.spanArr[index]+index;i++){
           this.selectionList[i].capacityNumber=row.capacityNumber;
-          this.selectionList[i].carrierId=row.carrierName;
-          this.selectionList[i].carrierName=carrierName;
-          this.selectionList[i].priceValue=priceValue;
-          this.selectionList[i].priceId=priceId;
+          this.selectionList[i].carrierName=row.carrierName;
         }
     },
     //初始化线路

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

@@ -280,20 +280,12 @@ export default {
           if(e.saleOrderConsigneeTel=="null"){
             e.saleOrderConsigneeTel = null
           }
-          var priceValueFirst = 0;
-          var priceIdFirst = 0;
-          e.carrierAndPriceList.forEach((a)=>{
-              if(a.id == e.carrierId){
-                  priceValueFirst = a.priceValue;
-                  priceIdFirst = a.priceId;
-              }
-          })
             //带承运商初始化派车表格
             var addmap = {
                 truckNo: e.truckNo,
                 saleOrderMaterialId: e.saleOrderMaterialId,
                 capacityNumber: null,
-                carrierName: e.carrierId,
+                carrierName: e.carrierName,
                 carrierId: e.carrierId,
                 materialId: e.materialId,
                 materialName: e.materialName,
@@ -307,13 +299,9 @@ export default {
                 saleShipperAddressName:e.place,
                 saleDateOfReceipt: e.receiptDate,
                 saleOrderConsignee: e.saleOrderConsignee,
-                saleOrderConsigneeTel: e.saleOrderConsigneeTel,
-                priceValue: priceValueFirst,
-                priceId: priceIdFirst
+                saleOrderConsigneeTel: e.saleOrderConsigneeTel
             };
             this.selectionList.push(addmap);
-            //填充承运商下拉框
-            this.carrierNameOptions.push(e.carrierAndPriceList);
             //调用记录每一行的合并数的方法
             this.getSpanArr(this.selectionList);
             //初始化每个车的线路
@@ -472,14 +460,11 @@ export default {
                   carrierId : 0,
                   //线路Id
                   lineId : 0,
-                  //运输单价Id
-                  priceId : 0
                 }
                 mapItem.capacityNumber = this.selectionList[i].capacityNumber,
                 mapItem.saleOrderMaterialId = this.selectionList[i].saleOrderMaterialId,
                 mapItem.carrierId = this.selectionList[i].carrierId,
                 mapItem.lineId = this.selectionList[i].lineId,
-                mapItem.priceId = this.selectionList[i].priceId
                 mapList.push(mapItem);
                 }
               }

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

@@ -14,26 +14,44 @@
       </el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
-      <!-- 已审批 -->
-       <el-tab-pane label="已审批" name="four">
-        <dilTable v-bind.sync="option4" ref="table">
-          <el-table-column fixed="right" label="操作" width="80">
+      <!-- 未上报 -->
+      <el-tab-pane label="未上报" name="first">
+        <dilTable v-bind.sync="option" ref="table3">
+          <el-table-column fixed="right" label="操作" align="center" width="200">
             <template slot-scope="scope">
               <el-button
-                @click="detailclick(scope.row)"
+                @click="uploadclick(scope.row.saleOrderId)"
+                type="text"
+                size="small"
+                >上传</el-button
+              >
+              <!-- <el-button
+                @click="click(scope.row.saleOrderId)"
+                type="text"
+                size="small"
+                >修改</el-button
+              > -->
+              <el-button
+                type="text"
+                size="small"
+                @click="deleteclick(scope.row.saleOrderId)"
+                >删除</el-button
+              >
+              <el-button
+                @click="detailclick3(scope.row)"
                 type="text"
                 size="small"
                 >物资详情</el-button
               >
             </template>
           </el-table-column>
-          <!-- 物资详情抽屉 -->
+        <!-- 物资详情抽屉 -->
         <el-table-column type="expand" width="1">
           <template slot-scope="props">
             <el-form label-position="center" inline class="demo-table-expand">
               <div v-if="false">{{ props }}</div>
               <div>
-                <el-table :data="tableData" border >
+                <el-table :data="tableData3" border >
                   <el-table-column
                     v-for="(item, i) in tableHead"
                     :key="i"
@@ -49,44 +67,26 @@
 
         </dilTable>
       </el-tab-pane>
-      <!-- 未上报 -->
-      <el-tab-pane label="未上报" name="first">
-        <dilTable v-bind.sync="option" ref="table3">
-          <el-table-column fixed="right" label="操作" align="center" width="200">
+      <!-- 已审批 -->
+       <el-tab-pane label="已审批" name="four">
+        <dilTable v-bind.sync="option4" ref="table">
+          <el-table-column fixed="right" label="操作" width="80">
             <template slot-scope="scope">
               <el-button
-                @click="uploadclick(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >上传</el-button
-              >
-              <!-- <el-button
-                @click="click(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >修改</el-button
-              > -->
-              <el-button
-                type="text"
-                size="small"
-                @click="deleteclick(scope.row.saleOrderId)"
-                >删除</el-button
-              >
-              <el-button
-                @click="detailclick3(scope.row)"
+                @click="detailclick(scope.row)"
                 type="text"
                 size="small"
                 >物资详情</el-button
               >
             </template>
           </el-table-column>
-        <!-- 物资详情抽屉 -->
+          <!-- 物资详情抽屉 -->
         <el-table-column type="expand" width="1">
           <template slot-scope="props">
             <el-form label-position="center" inline class="demo-table-expand">
               <div v-if="false">{{ props }}</div>
               <div>
-                <el-table :data="tableData3" border >
+                <el-table :data="tableData" border >
                   <el-table-column
                     v-for="(item, i) in tableHead"
                     :key="i"
@@ -146,7 +146,7 @@ export default {
   name: "saleOrder",
   data() {
     return {
-      activeName: "four",
+      activeName: "first",
       drawer: false,
       input: "",
       index: "",

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

@@ -49,15 +49,21 @@
 
               <!-- 承运商 -->
               <template v-if="item.prop == 'carrierName'">
-                 <el-select v-model="scope.row.carrierName" placeholder="请选择" 
-                  @change="batchUpdateValue(scope.row,scope.$index)">
-                  <el-option
-                    v-for="item in carrierNameOptions[scope.$index]"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
+                  <el-autocomplete
+                    class="inline-input"
+                    v-model="scope.row.carrierName"
+                    :fetch-suggestions="querySearch"
+                    placeholder="请输入承运商名称"
+                    :trigger-on-focus="false"
+                    @change="batchUpdateValue(scope.row,scope.$index)"
+                    @select="handleSelect"
+                  >
+                    <template slot-scope="{ item }">
+                      <div class="name" v-if="item.carrierName">
+                        {{ item.carrierName }}
+                      </div>
+                    </template>
+                  </el-autocomplete>
               </template>
 
               <!-- 物资件数 -->
@@ -140,6 +146,8 @@ export default {
       spanArr: [],
       //pos是spanArr的索引
       pos:0,
+      //所有选中承运商Id和承运商名称暂存
+      carrierIdAndName: [],
       //承运商下拉框中的值
       carrierNameOptions:[],
       //当前车序号物资
@@ -260,24 +268,46 @@ export default {
                 saleOrderConsigneeTel: e.saleOrderConsigneeTel,
             };
             this.selectionList.push(addmap);
-            //填充承运商下拉框
-            this.carrierNameOptions.push(e.carrierAndPriceList);
             //调用记录每一行的合并数的方法
             this.getSpanArr(this.selectionList);
           }
         });
-        //若没有承运商可选
-        if(this.carrierNameOptions[0].length==0){
-          //初始化
-          this.carrierNameOptions = [];
-          this.axios
-          .get("/api/v1/uc/getNoListCarrier")
-          .then((res)=>{
-              this.carrierNameOptions.push(res.data.data)
-          });
-        }
       });
     },
+
+    //承运商弹出层
+    handleSelect(item) {
+      let carrierIdAndNameItem = {
+        carrierId : item.carrierId,
+        carrierName : item.carrierName
+      }
+      this.carrierIdAndName.push(carrierIdAndNameItem);
+    },
+    //以下是承运商边输边查搜索
+    querySearch(queryString, cb) {
+      this.axios
+        .post("/api/v1/uc/getCarrierMesByLike?index=" + queryString)
+        .then((res) => {
+          if (res.data.code == "200") {
+            var restaurants = res.data.data;
+            var results = queryString
+              ? restaurants.filter(this.createFilter(queryString))
+              : restaurants;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+          }
+        });
+    },
+    createFilter(queryString) {
+      return (restaurants) => {
+        return (
+          restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
+          -1
+        );
+      };
+    },
+    //以上是承运商边输边查搜索
+
     onInput(val){
       if(!isNumber(val)){
         this.$message.warning('重量/电话号码请输入数字')
@@ -317,6 +347,12 @@ export default {
               //取得要发送的车序号和它的承运商
               for(var i=0;i<this.spanArr.length;i++){
                   if(this.spanArr[i]>0){
+                      //从所有选中承运商Id和承运商名称暂存中取出当前行的承运商Id
+                      this.carrierIdAndName.forEach((item) => {
+                        if(this.selectionList[i].carrierName==item.carrierName){
+                          this.selectionList[i].carrierId = item.carrierId;
+                        }
+                      })
                       var oneCarAndCarrier = {
                           //车序号Id
                           saleOrderMaterialId : 0,