修改

build/utils.js

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

src/views/WMS/components/steel/steel_outbound.vue

@@ -13,8 +13,8 @@
       </el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options" @selection-change="selectionChange" ref="table">
-      </dilTable>
+      <mergeRowTable v-bind.sync="options" @selection-change="selectionChange" ref="table">
+      </mergeRowTable>
     </div>
   </div>
 </template>
@@ -30,7 +30,11 @@ export default {
       endTime: null,
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmspOutboundResult?apiId=152&warehouseId="+3
+        requestUrl: "/api/v1/wms/getWmspOutboundResult?apiId=152&warehouseId="+3,
+        comparison:"orderNumber1",
+        columnIndexs:[
+          0,1,2,3,4,5,6,7,8,9,10,13
+        ]
         // selectionType: "select",
         // mapList: [],
       },
@@ -41,6 +45,7 @@ export default {
     //   	this.$router.push("/inboundDetails/" + scope.row.inboundId)
     // },
     onclick(){
+      console.log(this.options);
       let startTime = null;
       let endTime = null;
       if (this.startTime) {

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

@@ -684,13 +684,13 @@ export default {
       var sendCount = this.selectionList.length*this.uniteOrderPlanWeight;
       //判断是否达到总重量减80吨的重量
       var canDo = ((this.number-80)-(this.totalWeight+sendCount));
-      if(canDo<0&&this.number>=100){
+      if(this.materialName!='钒渣'&&canDo<0&&this.number>=100){
         var canSend = Math.floor(((this.number-80)-this.totalWeight)/this.uniteOrderPlanWeight);
         if(canSend<0){
           canSend = 0;
         }
         this.$message.error('当前已派发吨数接近订单总吨数,最多还可派 ('+canSend+') 辆车!')
-      }else if(this.number<100&&this.totalWeight>20){
+      }else if(this.materialName!='钒渣'&&this.number<100&&this.totalWeight>20){
         this.$message.error('当前可派发车数已用完!')
       }else{
         let state = false;
@@ -729,6 +729,7 @@ export default {
                 e.priceValue = null;
                 e.priceId = null;
               })
+              //发送请求
               this.sendRequest(beReady);
             }else{
               //判断是否全部完成运输单价的选择