tijiao

build/utils.js

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

config/index.js

@@ -49,7 +49,7 @@ let proxyTable = {
   },
   // 表格表单请求的域名地址
   "/api/v1/cd": {
-    target: "http://172.16.33.166:8083",
+    target: "http://172.16.33.161:8083",
     ws: true,
     pathRewrite: {
       "^/api/v1/cd": "/api/v1/cd"
@@ -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",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
@@ -74,7 +74,7 @@ let proxyTable = {
   },
   "/views/api/v1": {
     target: "http://172.16.33.166:80",
-    // target: "http://192.168.1.106:8080",
+    // target: "http://192.168.1.109:8080",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"

src/views/TMS/components/importedEmergency/editWagonLoadEmergency.vue

@@ -192,7 +192,7 @@ export default {
         tmstrainLoadingResult.resultLoadingDate == null ||
         tmstrainLoadingResult.batchId == null
       )
-        this.$message.error("必填项存在空值！2");
+        this.$message.error("必填项存在空值！");
       else
         this.axios
           .post(

src/views/TMS/components/importedMine/editWagonLoad.vue

@@ -189,7 +189,7 @@ export default {
         tmstrainLoadingResult.arrivalStationId == null ||
         tmstrainLoadingResult.resultLoadingDate == null
       )
-        this.$message.error("必填项存在空值！1");
+        this.$message.error("必填项存在空值！");
       else
         this.axios
           .post(

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/addSaleOrder.vue

@@ -640,9 +640,7 @@
       </el-table>
       <div class="button-box">
         <el-button @click="orderMakeSure = false">返回编辑</el-button>
-        <el-button type="primary" @click="sendRequest" :disabled="notDebounce"
-          >提交订单</el-button
-        >
+        <el-button type="primary" @click="sendRequest">提交订单</el-button>
       </div>
     </el-dialog>
 
@@ -660,7 +658,6 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      notDebounce: false,
       consigneeDisable: false,
       isCellClick: 0,
       truckRemark: "",
@@ -1693,7 +1690,6 @@ export default {
     },
     //发送请求
     sendRequest() {
-      this.notDebounce = true;
       this.orderMakeSure = false;
       //是否还有件数未填写
       var orderPlanWeightAllFill = 0;
@@ -1724,9 +1720,7 @@ export default {
           //是否磅重销售
           isPoundSale: 0,
           //备注
-          truckRemark: "",
-          //物资名称
-          materialName: ""
+          truckRemark: ""
         };
         mapItem.truckNo = item.cxh;
         mapItem.shipperAddressId = item.saleShipperAddressId;
@@ -1734,7 +1728,6 @@ export default {
         mapItem.saleDateOfReceipt = sjTime(item.saleDateOfReceipt);
         mapItem.saleOrderConsigneeTel = item.saleOrderConsigneeTel;
         mapItem.materialId = item.materialId;
-        mapItem.materialName = item.materialName;
         mapItem.materialNumber = item.orderPlanWeight;
         mapItem.steelMeters = item.meterNumber;
         mapItem.isPoundSale = item.isPound;

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{
               //判断是否全部完成运输单价的选择

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

@@ -43,15 +43,6 @@
         v-if="activeName == 'first'"
         ><i class="el-icon-download"></i>Excel</el-button
       >
-      <el-button disabled>物资总件数</el-button>
-      <el-input
-        placeholder=""
-        v-model="matSum"
-        clearable
-        style="width:100px"
-        disabled
-      >
-      </el-input>
     </div>
     <div class="table">
       <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -62,7 +53,6 @@
             ref="excelDom"
             @selection-change="selectionChange"
             :pageSize="200"
-            @func="func"
           >
             <el-table-column
               fixed="right"
@@ -190,7 +180,6 @@ export default {
   name: "saleOrder",
   data() {
     return {
-      matSum: 0,
       startTime: null,
       endTime: null,
       batchReportList: [],
@@ -454,29 +443,15 @@ export default {
         this.$message.error("请先选择需要批量上传的销售订单");
         return;
       }
-      const loading = this.$loading({
-        lock: true,
-        text: "Loading",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)"
-      });
       this.axios
         .post("/api/v1/ams/uploadSaleOrderList", this.batchReportList)
         .then(res => {
           if (res.data.code == "200") {
             this.$message.success("上传成功");
-            loading.close();
             this.getRequestUrl();
           } else {
-            this.$message.error("上传失败,请联系管理员");
-            loading.close();
-            this.getRequestUrl();
+            this.$message.error("上传失败");
           }
-        })
-        .catch(e => {
-          this.$message.error("上传失败,请联系管理员");
-          loading.close();
-          this.getRequestUrl();
         });
     },
     selectionChange(selection) {
@@ -485,7 +460,7 @@ export default {
       this.batchReportList = selection;
     },
     refresh() {
-      this.getRequestUrl();
+      this.$router.go(0);
     },
     handleClick(tab, event) {
       console.log(tab, event);

src/views/appoint/router/index.js

@@ -375,7 +375,7 @@ const constantRouterMap = [
       {
         path: "saleOrderCoproduct",
         name: "saleOrderCoproduct",
-        meta: { code: "xtpzgl-yhgl", keepAlive: true },
+        meta: { code: "xtpzgl-yhgl" },
         component: saleOrderCoproduct
       },
       {

src/views/sale/components/transport_order/saleSteelOrder.vue

@@ -41,7 +41,7 @@
     <el-tabs v-model="activeName">
       <!-- 未接收 -->
       <el-tab-pane label="未接收" name="third">
-        <MergeRowTable
+        <dilTable
           v-bind.sync="option3"
           @selection-change="selectionChange"
           ref="table2"
@@ -93,11 +93,11 @@
               </el-form>
             </template>
           </el-table-column>
-        </MergeRowTable>
+        </dilTable>
       </el-tab-pane>
       <!-- 已接收 -->
       <el-tab-pane label="已接收" name="first">
-        <MergeRowTable
+        <dilTable
           v-bind.sync="option1"
           ref="table"
           :isHeigth="isHeigth"
@@ -141,11 +141,11 @@
               </el-form>
             </template>
           </el-table-column>
-        </MergeRowTable>
+        </dilTable>
       </el-tab-pane>
       <!-- 已拒绝 -->
       <el-tab-pane label="已拒绝" name="second">
-        <MergeRowTable
+        <dilTable
           v-bind.sync="option2"
           ref="table1"
           :isHeigth="isHeigth"
@@ -182,7 +182,7 @@
               </el-form>
             </template>
           </el-table-column>
-        </MergeRowTable>
+        </dilTable>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -203,16 +203,12 @@ export default {
         requestUrl:
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&shipperId=1&carrierSsoId=" +
           "",
-        comparison: "orderNumber",
-        columnIndexs: [0, 1, 2, 3, 11, 12, 13, 16, 21, 22, 23, 24]
       },
       option2: {
         // option2请求数据的地址，承运商暂时设置为默认（运输订单状态为）
         requestUrl:
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&shipperId=1&carrierSsoId=" +
           "",
-        comparison: "orderNumber",
-        columnIndexs: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
       },
       option3: {
         // option3请求数据的地址
@@ -221,12 +217,10 @@ export default {
           "",
         selectionType: "select",
         mapList: [],
-        comparison: "orderNumber",
-        columnIndexs: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
       },
       truck: {
         requestUrl: "",
-        selectionType: "radio"
+        selectionType: "radio",
       },
       activeName: "third",
       //记录旧的row对象(已接收)
@@ -245,30 +239,30 @@ export default {
         {
           prop: "materialName",
           label: "物资名称",
-          width: 150
+          width: 150,
         },
         {
           prop: "specificationModel",
           label: "规格型号",
-          width: 150
+          width: 150,
         },
         {
           prop: "materialNumber",
           label: "物资件数",
-          width: 100
+          width: 100,
         },
         {
           prop: "materialWeight",
           label: "物资重量",
-          width: 100
-        }
+          width: 100,
+        },
       ],
       tableData: [],
       tableData1: [],
       tableData2: [],
       capacityId: null,
       dialogTableVisible: false,
-      orderId: null
+      orderId: null,
     };
   },
 
@@ -367,34 +361,34 @@ export default {
       if (this.option3.mapList.length == 0) {
         this.$message({
           type: "warning",
-          message: "请先选择要关闭的订单!"
+          message: "请先选择要关闭的订单!",
         });
       } else {
         this.$confirm("是否关闭这些订单", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
-          center: true
+          center: true,
         })
           .then(() => {
             //初始化maplist
             var mapList = [];
-            this.option3.mapList.forEach(item => {
+            this.option3.mapList.forEach((item) => {
               //初始化mapItem
               var mapItem = {
                 //销售订单物资中间表id
-                orderId: 0
+                orderId: 0,
               };
               mapItem.orderId = item.orderId;
               mapList.push(mapItem);
             });
             this.$message({
               type: "success",
-              message: "关闭成功!"
+              message: "关闭成功!",
             });
             this.axios
               .post("/api/v1/oms/batchCloseOrder", mapList)
-              .then(res => {
+              .then((res) => {
                 if (res.data.code == "200") {
                   this.getRequestUrl();
                 }
@@ -403,7 +397,7 @@ export default {
           .catch(() => {
             this.$message({
               type: "info",
-              message: "取消关闭!"
+              message: "取消关闭!",
             });
           });
       }
@@ -455,9 +449,9 @@ export default {
       this.axios
         .post("/api/v1/oms/updateCapacityId", {
           capacityId: this.capacityId,
-          orderId: this.orderId
+          orderId: this.orderId,
         })
-        .then(res => {
+        .then((res) => {
           if (res.data.code == "200") {
             this.$message.success("修改运力成功");
             this.getRequestUrl();
@@ -543,7 +537,7 @@ export default {
       // 根据销售订单id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then(res => {
+        .then((res) => {
           console.log("res.data.data", res.data.data);
           this.tableData = res.data.data;
         });
@@ -575,7 +569,7 @@ export default {
       // 根据销售订单物资中间表id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then(res => {
+        .then((res) => {
           console.log("res.data.data", res.data.data);
           this.tableData1 = res.data.data;
         });
@@ -607,7 +601,7 @@ export default {
       // 根据销售订单物资中间表id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then(res => {
+        .then((res) => {
           this.tableData2 = res.data.data;
         });
     },
@@ -617,17 +611,17 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true
+        center: true,
       })
         .then(() => {
           this.axios
             .post("/api/v1/oms/closeOrder?orderId=" + row.orderId)
-            .then(res => {
+            .then((res) => {
               if (res.data.code == "200") {
                 this.getRequestUrl();
                 this.$message({
                   type: "success",
-                  message: "关闭成功!"
+                  message: "关闭成功!",
                 });
               }
             });
@@ -635,11 +629,11 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消关闭!"
+            message: "取消关闭!",
           });
         });
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scode>

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

@@ -1,11 +1,11 @@
 //化产焦炭统计报表
 <template>
   <div class="purchasFuelNewMonitor">
-    <div class="items">
+    <div class="frameCalculation">
       <el-form :inline="true" style="margin-top :5px">
         <el-form-item>
           <label class="el-form-item__label" style="width: auto;"
-            >计毛时间:</label
+            >计毛时间：</label
           >
           <el-date-picker
             v-model="startTime"
@@ -40,6 +40,7 @@
             <i class="el-icon-search"></i>
           </el-button>
         </el-form-item>
+
         <el-form-item>
           <el-button type="primary" @click="exportData()"
             ><i class="el-icon-download"></i>Excel</el-button
@@ -293,9 +294,9 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .purchasFuelNewMonitor {
-  .items {
+  .frameCalculation {
     margin-left: 20px;
     margin-top: 20px;
   }

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

@@ -279,7 +279,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .purchasFuelNewMonitor {
   .items {
     margin-left: 20px;