dahjsf

build/utils.js

@@ -15,8 +15,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-
- let devModules = ['index','inward']
+let devModules = ['all']
+//  let devModules = ['index','inward','TMS']
 //  let devModules = ['index','TMS','inward']
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
 // let devModules = ['index','appoint','WMS'];

config/index.js

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

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

@@ -162,7 +162,7 @@ export default {
     },
     // 是否在数据翻页后保留之前选中的数据（需指定 row-key）
     reserveSelection: {
-      default: false,
+      default: true,
     },
     // 是否为斑马纹 table
     stripe: {
@@ -256,7 +256,7 @@ export default {
     // 刷新表格数据
     refreshData() {
       this.requestData();
-      //多选表格，清空用户的选择
+      // 多选表格清空用户的选择
       this.$refs.mainTable.clearSelection();
     },
     toggleRowExpansion(row, expanded) {

src/views/TMS/components/importedIngredients/transportReserveFu.vue

@@ -24,7 +24,7 @@
         <i class="el-icon-plus"></i>下发
       </el-button>
     </div>
-    <el-tabs v-model="activeName">
+    <el-tabs v-model="activeName" tab-click="handleClick">
       <!-- 未下发 -->
       <el-tab-pane label="未下发" name="first">
         <dilTable
@@ -114,6 +114,27 @@ export default {
     }
   },
   methods: {
+    handleClick(){
+      this.getRequestUrl()
+    },
+    getRequestUrl(){
+        //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&carrierSSOId=" +
+        getCookie("userId") + "&i=" + new Date();
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
+        getCookie("userId") + "&i=" + new Date();
+    } else {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&carrierSSOId=" +
+        null + "&i=" + new Date();
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=5&carrierSSOId=" +
+        null + "&i=" + new Date();
+    }
+    },
     onclick() {
       if (this.activeName == "first") {
         //判断是否是承运商
@@ -181,9 +202,7 @@ export default {
               type: "success",
               message: "下发成功!",
             });
-            this.option1.requestUrl =
-              "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&i=" +
-              new Date();
+            this.getRequestUrl()
           });
         })
         .catch(() => {
@@ -212,7 +231,7 @@ export default {
               capacityNumber: capacityNumber,
             })
             .then(() => {
-              this.$router.go(0);
+              this.getRequestUrl()
             });
         })
         .catch(() => {

src/views/TMS/components/importedIngredients/transportReserveFuAddIngredients.vue

@@ -59,6 +59,29 @@
           >浏览</el-button
         >
       </div>
+    </div>
+      <!-- 物资和装卸点以及装卸货次序 -->
+    <div class="swtichTop">
+    <span class="titile">选择车辆前请选择物资单位！</span>
+    <div class="switch" v-if="selectionList.length > 0">
+      <el-tooltip placement="top">
+        <div slot="content">下面表格已有数据，不能进行更改！！！</div>
+        <el-switch
+          v-model="value"
+          active-text="件数"
+          inactive-text="重量"
+          disabled
+        >
+        </el-switch>
+      </el-tooltip>
+    </div>
+    <div class="switch" v-else>
+      <el-tooltip placement="top">
+        <div slot="content">当下面表格有数据之后，将不能进行更改！！！</div>
+        <el-switch v-model="value" active-text="件数" inactive-text="重量">
+        </el-switch>
+      </el-tooltip>
+    </div>
     </div>
     <div class="truckListTable">
       <el-table
@@ -89,6 +112,14 @@
                   v-model.number="scope.row.orderMaterialWeight"
                 ></el-input>
               </template>
+              <!-- 物资件数 -->
+              <template v-if="item.prop == 'orderMaterialNumber'">
+                <el-input
+                  class="textinput"
+                  v-model.number="scope.row.orderMaterialNumber"
+                  @input="onInputNumber(scope.row.orderMaterialNumber)"
+                ></el-input>
+              </template>
             </template>
             <template v-else>
               <span>{{ scope.row[item.prop] }}</span>
@@ -144,11 +175,8 @@
         <dilTable
           v-bind.sync="third"
           @selection-change="currentRadioChange3"
-          :isKuang="isKuang"
-          @func="func"
           :isHeigth="isHeigth2"
           :shiyHeigth="shiyHeigth2"
-          :drawer="drawer"
         ></dilTable>
       </div>
       <div v-show="onDrawerNumber == 4">
@@ -221,17 +249,6 @@ export default {
       //采购订单号
       purchaseOrderNo: "",
       isMoreTrips: false,
-      //订单类别
-      orderTypeList: [
-        {
-          value: 6,
-          label: "老厂区",
-        },
-        {
-          value: 7,
-          label: "新厂区",
-        },
-      ],
       // 线路名称
       lineName: "",
       //线路id
@@ -314,6 +331,7 @@ export default {
         requestUrl: "",
         selectionType: "radio",
       },
+      truckList:[]
     };
   },
   watch: {
@@ -322,6 +340,23 @@ export default {
         this.input = null;
       }
     },
+    value() {
+      if (this.value) {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialNumber",
+          label: "件数",
+          slot: true,
+        });
+      } else {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialWeight",
+          label: "重量",
+          slot: true,
+        });
+      }
+    },
   },
   created() {
     if (getCookie("orgCode") == "chengyunshang") {
@@ -481,18 +516,29 @@ export default {
         }
       }
     },
+    func(res) {
+      console.log(res);
+      this.isKuang = false;
+    },
+    refreshTable(){
+        var arr = this.selectionList
+        this.selectionList = []
+   
+    },
     ondrawer(num) {
+      this.truckList = this.selectionList
+      this.selectionList = []
       if(this.supplierId == null){
           this.$message.warning("请先选择发货单位")
           return
       }
-      console.log(num)
       if(num != 1 && this.materialId == null){
           this.$message.warning("请先选择物资")
           return
       }
       this.drawer = true;
       this.onDrawerNumber = num;
+      this.refreshTable()
       if (num == 1) {
           this.frist.requestUrl =
           "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
@@ -556,13 +602,8 @@ export default {
       this.purchaseOrderId = selection.purchaseOrderId;
     },
     currentRadioChange3(selection) {
-      this.selectionList = [];
       this.selectionList = selection;
     },
-    func(res) {
-      console.log(res);
-      this.isKuang = false;
-    },
     // 确认
     onClickConfirm() {
       var state = 0;
@@ -583,13 +624,6 @@ export default {
           });
           return;
         } 
-        // else if (!this.orderType) {
-        //   this.$message({
-        //     message: "请选择订单类别!",
-        //     type: "warning",
-        //   });
-        //   return;
-        // }
          else if (!this.supplierId) {
           this.$message({
             message: "请选择发货单位!",
@@ -722,6 +756,20 @@ export default {
     height: 1px;
   }
 }
+.swtichTop{
+  display: flex;
+  height: 40px;
+  align-content: center;
+  justify-content: center;
+  padding-right:20px ;
+  .titile{
+    color: red;
+    font-size: 14px;
+  }
+  .switch{
+    margin-right: -30px
+  }
+}
 .supplieUnit {
   display: flex;
   justify-content: center;

src/views/inward/components/truckAppoint/addPlan.vue

@@ -21,7 +21,7 @@
   <div class="truckNum">
     <el-form  class="demo-form-inline"  label-width="80px" label-position="left">
     <el-form-item label="车数">
-    <el-input   v-model="planTruckNumber" placeholder="必填" class="input"></el-input>
+    <el-input   v-model="planTruckNumber" placeholder="非必填" class="input"></el-input>
     </el-form-item>
   </el-form>
   </div>
@@ -196,16 +196,13 @@ export default {
       if(this.carrierId == null){
         this.$alert('请输入承运商！')
         return
-      }else if(this.planTruckNumber == null){
-        this.$alert('请输入车数！')
-        return
       }else if(this.requirementId== null){
         this.$alert('请选择需要制定计划的需求！')
         return
       }
       let plan = {
         requirementId : this.mapList.requirementId,
-        planTruckNumber: this.planTruckNumber,
+        planTruckNumber: Number(this.planTruckNumber),
         carrierId: this.carrierId
       };
       this.axios

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -317,7 +317,8 @@ export default {
         requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
         selectionType: "radio",
         mapList2: []
-      }
+      },
+      form:{}
     };
   },
   watch: {
@@ -498,21 +499,21 @@ export default {
       if(this.shipperId == null){
         this.$message.error("请选择用车单位")
         return
-      }if(typeof(this.form.requirementEstimatedDuration) == 'undefined'){
-        this.$message.error("请输入预计用车时长")
-        return
       }if(typeof(this.form.requirementTruckTime) == 'undefined'){
         this.$message.error("请输入用车时间")
         return
       }if(typeof(this.form.requirementType) == 'undefined'){
         this.$message.error("请选择需求类型")
         return
-      }if(typeof(this.form.requirementWorkType) == 'undefined'){
-        this.$message.error("请输入费用类别")
-        return
       }if(this.tableData.length == 0){
         this.$message.error("请点击浏览选择物资")
         return
+      }if(typeof(this.form.requirementOverlimit) != 'undefined'){
+        console.log((typeof(this.form.remark) == 'undefined'))
+        if((typeof(this.form.remark) == 'undefined')){
+          this.$message.error("请填写超限备注")
+          return
+        }
       }
       var i=0
       this.tableData.forEach((e) =>{
@@ -533,7 +534,7 @@ export default {
       }
       let requiremnet = {
         requirementEstimatedDuration: this.form.requirementEstimatedDuration,
-        requirementOverlimit: this.form.requirementOverlimit,
+        requirementOverlimit: this.form.requirementOverlimit + this.form.remark + '米',
         requirementTruckTime: sjTime(this.form.requirementTruckTime),
         requirementType: this.form.requirementType,
         requirementWorkContent: this.form.requirementWorkContent,
@@ -545,7 +546,7 @@ export default {
         mapList:this.tableData,
         orgCode:getCookie("orgCode")
       };
-      // console.log("requirement",requiremnet);
+      console.log("requirement",requiremnet);
       this.axios
         .post("/api/v1/ams/addTruckRequirement", requiremnet)
         .then(res => {
@@ -559,6 +560,10 @@ export default {
             this.$message.error("新增失败！");
           }
         });
+    },
+     func(res) {
+      console.log(res);
+      this.isKuang = false;
     },
     // 返回
     cancel() {

src/views/inward/components/truckAppoint/plan.vue

@@ -7,7 +7,8 @@
       <el-button type="primary" class="btn">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button
+      <el-badge :value="addPlanCount" class="item" v-if="activeName == 'second'">
+        <el-button
         type="primary"
         class="btn"
         @click="toInsert"
@@ -15,6 +16,8 @@
       >
         <i class="el-icon-plus"></i>制定计划
       </el-button>
+      </el-badge>
+      
       <el-button
         type="primary"
         class="btn"
@@ -211,6 +214,8 @@ export default {
         },
       ],
       tableData: [],
+      addPlanCount:0,
+      timer:""
     };
   },
   created(){
@@ -218,8 +223,27 @@ export default {
       this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=257&planStatus=0",
       this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1",
       this.fourth.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4"
+      
+  },
+  mounted(){
+    this.getAddPlan()
+    this.start()
+    
+    // this.getAddPlan()
+  },
+  beforeDestroy(){
+    this.timer
   },
   methods: {
+    getAddPlan(){
+        this.axios.post("/api/v1/ams/getTruckRequirementList?apiId=250&requirementStatus=2").then((res) =>{
+          console.log(res.data.data.list.length)
+          this.addPlanCount = res.data.data.list.length
+        })
+    },
+    start(){
+        this.timer = setInterval(this.getAddPlan,60000)
+    },
     getRequirementMaterial(row) {
       // 记录重复点击次数
       if (this.oldRow === row) {