Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/api/fleet/ftmsorderbills.js

@@ -20,7 +20,7 @@ export function getFtmsorderbills(id) {
 // 新增订单主
 export function addFtmsorderbills(data) {
   return request({
-    url: '/fleet/ftmsorderbills',
+    url: '/fleet/ftmsorderbills/add',
     method: 'post',
     data: data
   })

src/api/fleet/ftmsorderbillsplans.js

@@ -50,4 +50,29 @@ export function exportFtmsorderbillsplans(query) {
     method: 'get',
     params: query
   })
+}
+
+//单条订单调度提交
+export function singleaddFtmsorderbillsplans(data) {
+  return request({
+    url: '/fleet/ftmsorderbillsplans/schedulingSave',
+    method: 'post',
+    data: data
+  })
+}
+//单条订单调度撤销
+export function revokeFtmsorderbillsplans(data) {
+  return request({
+    url: '/fleet/ftmsorderbillsplans/schedulingRevoke',
+    method: 'post',
+    data: data
+  })
+}
+//单条订单调度删除
+export function removeFtmsorderbillsplans(data) {
+  return request({
+    url: '/fleet/ftmsorderbillsplans/schedulingRemove',
+    method: 'post',
+    data: data
+  })
 }

src/main.js

@@ -77,3 +77,91 @@ new Vue({
   store,
   render: h => h(App)
 })
+Vue.directive("input-limit", {
+  bind(el, binding) {
+    var wins_0 = /[^\d]/g //整数判断
+    var wins_1 = /[^\d^\.]/g //小数判断
+    var flag = true;
+    var points = 0;
+    var lengths = 0
+    var remainder = 0
+    var no_int = 0
+    const target = el instanceof HTMLInputElement ? el : el.querySelector("input");
+    target.addEventListener("compositionstart", e => {
+      flag = false;
+    });
+    target.addEventListener("compositionend", e => {
+      flag = true;
+    });
+    target.addEventListener("input", e => {
+      setTimeout(function() {
+        if (flag) {
+          if (binding.value == 0) {
+            if (wins_0.test(e.target.value)) {
+              e.target.value = e.target.value.replace(wins_0, "");
+              e.target.dispatchEvent(new Event("input")) //手动更新v-model值
+            }
+          }
+          if (binding.value == 1) {
+            if (wins_0.test(e.target.value.toString().replace(/\d+\.(\d*)/, '$1'))) {
+              remainder = true
+            }
+            if ((e.target.value.split('.')).length - 1 > 1) {
+              points = true
+            }
+            if (e.target.value.toString().split(".")[1] != undefined) {
+              if (e.target.value.toString().split(".")[1].length > 1) {
+                lengths = true
+              }
+            }
+            if (e.target.value.toString().indexOf(".") != -1) {
+              no_int = false
+            } else {
+              no_int = true
+            }
+            if (wins_1.test(e.target.value) || lengths || points || remainder) {
+              if (!no_int) {
+                e.target.value = e.target.value.replace(wins_1, "").replace('.', '$#$').replace(/\./g, '').replace(
+                  '$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').substring(0, e.target.value.indexOf(
+                  ".") + 2)
+              } else {
+                e.target.value = e.target.value.replace(wins_0, "")
+              }
+              e.target.dispatchEvent(new Event("input"))
+            }
+          }
+
+
+          if (binding.value == 2) {
+            if (wins_0.test(e.target.value.toString().replace(/\d+\.(\d*)/, '$1'))) {
+              remainder = true
+            }
+            if ((e.target.value.split('.')).length - 1 > 1) {
+              points = true
+            }
+            if (e.target.value.toString().split(".")[1] != undefined) {
+              if (e.target.value.toString().split(".")[1].length > 2) {
+                lengths = true
+              }
+            }
+            if (e.target.value.toString().indexOf(".") != -1) {
+              no_int = false
+            } else {
+              no_int = true
+            }
+            if (wins_1.test(e.target.value) || lengths || points || remainder) {
+              if (!no_int) {
+                e.target.value = e.target.value.replace(wins_1, "").replace('.', '$#$').replace(/\./g, '').replace(
+                  '$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').substring(0, e.target.value.indexOf(
+                  ".") + 3)
+              } else {
+                e.target.value = e.target.value.replace(wins_0, "")
+              }
+              e.target.dispatchEvent(new Event("input"))
+            }
+          }
+        }
+      }, 0)
+    })
+  }
+})

src/views/fleet/plans/index.vue

@@ -8,13 +8,20 @@
       label-width="68px"
     >
       <el-form-item label-width="100px" label="客户名称" prop="corpId">
-        <el-input
+        <el-select
           v-model="queryParams.corpId"
           placeholder="请输入客户名称"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
-        />
+          filterable
+        >
+          <el-option
+            v-for="(dict, index) in fMblnoOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label-width="100px" label="业务类型" prop="billType">
         <el-select
@@ -71,13 +78,20 @@
         />
       </el-form-item>
       <el-form-item label-width="100px" label="货品名称" prop="goodsId">
-        <el-input
+        <el-select
           v-model="queryParams.goodsId"
           placeholder="请输入货品名称"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
-        />
+          filterable
+        >
+          <el-option
+            v-for="(dict, index) in goodsOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label-width="100px" label="提箱地点" prop="loadAddr">
         <el-input
@@ -247,7 +261,7 @@
         align="center"
         class-name="small-padding fixed-width"
         fixed="right"
-        width="200px"
+        width="150px"
       >
         <template slot-scope="scope">
           <el-button
@@ -292,6 +306,9 @@
       :form="form"
       :planList="planList"
       :disabled="disabled"
+      :DList="DList"
+      :CList="CList"
+      :schedulingList="schedulingList"
       @changeShow="showAddOrUpdate"
       @fixDisabled="fixDisabled"
       ref="addOrUpdateRef"
@@ -307,6 +324,8 @@ import {
   delFtmsorderbills,
   exportFtmsorderbills,
 } from "@/api/fleet/ftmsorderbills";
+import { listGoods } from "@/api/basicdata/goods";
+import { listCorps } from "@/api/basicdata/corps";
 import { addSet, select } from "@/api/system/set";
 import Cookies from "js-cookie";
 import draggable from "vuedraggable";
@@ -508,7 +527,12 @@ export default {
       allCheck: false,
       title: "",
       form: {},
-      planList:[]
+      planList: [],
+      DList: [],
+      CList: [],
+      schedulingList: [],
+      fMblnoOptions: [],
+      goodsOptions: [],
     };
   },
   // 使用子组件
@@ -527,6 +551,12 @@ export default {
     this.getDicts("data_transProp").then((response) => {
       this.transPropList = response.data;
     });
+    listGoods().then((response) => {
+      this.goodsOptions = response.rows;
+    });
+    listCorps().then((response) => {
+      this.fMblnoOptions = response.rows;
+    });
     this.getRow();
   },
   methods: {
@@ -658,6 +688,11 @@ export default {
         remarks: null,
       };
       this.resetForm("form");
+      this.planList = [];
+      this.DList = [];
+      this.CList = [];
+      this.schedulingList=[];
+      this.disabled=false;
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -673,20 +708,68 @@ export default {
         if (response.data.tmsorder.billType != null) {
           response.data.tmsorder.billType = response.data.tmsorder.billType.toString();
         }
-        //  response.data.scntrs.cntrId = response.data.scntrs.cntrId.toString();
+        if (response.data.scntrs.length != 0) {
+          response.data.scntrs.cntrId = response.data.scntrs.map((e) => {
+            return (e.cntrId = e.cntrId.toString());
+          });
+        }
+        if (response.data.plans.length != 0) {
+          response.data.plans.cntrId = response.data.plans.map((e) => {
+            if (e.cntrId != null) {
+              return (e.cntrId = e.cntrId.toString());
+            }
+          });
+        }
+
         if (row.billStatus == 6) {
           this.disabled = true;
           this.title = "查看订单主";
         } else {
           this.title = "修改订单主";
         }
-        this.$refs.addOrUpdateRef.showSure();
+        // this.$refs.addOrUpdateRef.showSure();
         this.form = response.data.tmsorder;
-        this.planList=response.data.scntrs;
-        console.log(this.planList)
+        this.planList = response.data.scntrs;
+        if (response.data.fees.length) {
+          this.DList = response.data.fees.filter((e) => e.fdc == "D");
+          this.CList = response.data.fees.filter((e) => e.fdc == "C");
+        } else {
+          this.DList = [];
+          this.CList = [];
+        }
+        this.schedulingList = response.data.plans;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
       });
     },
+    //获取到保存并复制
+    getSave(data) {
+      if (data.data.tmsorder.billType != null) {
+        data.data.tmsorder.billType = data.data.tmsorder.billType.toString();
+      }
+      if (data.data.scntrs.length != 0) {
+        data.data.scntrs.cntrId = data.data.scntrs.map((e) => {
+          return (e.cntrId = e.cntrId.toString());
+        });
+      }
+      if (data.data.plans.length != 0) {
+        data.data.plans.cntrId = data.data.plans.map((e) => {
+          return (e.cntrId = e.cntrId.toString());
+        });
+      }
+      this.title = "修改订单主";
+      this.form = data.data.tmsorder;
+      this.planList = data.data.scntrs;
+      console.log(data.data);
+      if (data.data.fees.length != 0) {
+        this.DList = data.data.fees.filter((e) => e.fdc == "D");
+        this.CList = data.data.fees.filter((e) => e.fdc == "C");
+      } else {
+        this.DList = [];
+        this.CList = [];
+      }
+      this.schedulingList = data.data.plans;
+      console.log(this.schedulingList)
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
@@ -737,11 +820,35 @@ export default {
         this.addOrUpdateVisible = true;
       }
     },
-    fixDisabled(data){
-       if (data === "false") {
+    fixDisabled(data) {
+      if (data === "false") {
         this.disabled = false;
       }
-    }
+    },
+    // //客户名称
+    // changefCorpid(row) {
+    //   console.log(row);
+    //   this.$set(row, "fSbu", row.fCorpid);
+    //   for (let corp in this.fMblnoOptions) {
+    //     if (row.fCorpid === this.fMblnoOptions[corp].fId) {
+    //       this.$set(
+    //         this.form,
+    //         "fStltypeid",
+    //         this.fMblnoOptions[corp].fStltypeid + ""
+    //       );
+    //     }
+    //   }
+    // },
+    // /* 远程模糊查询用户 */
+    // corpsRemoteMethod(name) {
+    //   console.log(name);
+    //   if (name == null || name === "") {
+    //     this.fMblnoOptions = [];
+    //     return;
+    //   }
+    //   let queryParams = { pageNum: 1, pageSize: 10, fName: name, type: 1 };
+
+    // },
   },
 };
 </script>

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -74,7 +74,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-         <el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="装车地点" prop="loadAddr">
               <el-input v-model="form.loadAddr" placeholder="请输入装车地点" />
@@ -151,7 +151,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-                <el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="提单号" prop="mblno">
               <el-input v-model="form.mblno" placeholder="请输入提单号" />
@@ -318,86 +318,121 @@
                   </el-form-item>
                 </div>
               </div>
-             <el-table :data="planList">
-          <el-table-column label="箱型" align="center" prop="cntrId">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.cntrId" placeholder="请选择箱型">
-                <el-option
-                  v-for="(dict, index) in cntrIdList"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
-              <!-- <el-input v-model="scope.row.cntrId" placeholder="箱型" /> -->
-            </template>
-          </el-table-column>
+              <el-table :data="planList">
+                <el-table-column label="箱型" align="center" prop="cntrId">
+                  <template slot-scope="scope">
+                    <el-select
+                      v-model="scope.row.cntrId"
+                      placeholder="请选择箱型"
+                    >
+                      <el-option
+                        v-for="(dict, index) in cntrIdList"
+                        :key="index.dictValue"
+                        :label="dict.dictLabel"
+                        :value="dict.dictValue"
+                      />
+                    </el-select>
+                    <!-- <el-input v-model="scope.row.cntrId" placeholder="箱型" /> -->
+                  </template>
+                </el-table-column>
 
-          <el-table-column label="计价方式" align="center" prop="priceType">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.priceType" placeholder="计价方式" />
-            </template>
-          </el-table-column>
+                <el-table-column
+                  label="计价方式"
+                  align="center"
+                  prop="priceType"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.priceType"
+                      placeholder="计价方式"
+                    />
+                  </template>
+                </el-table-column>
 
-          <el-table-column label="运价" align="center" prop="pricecr">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.pricecr" placeholder="运价" />
-            </template>
-          </el-table-column>
-          <el-table-column label="卸箱场站" align="center" prop="unLoadAddr">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.unLoadAddr" placeholder="卸箱场站" />
-            </template>
-          </el-table-column>
-          <el-table-column label="卸箱时间" align="center" prop="unLoadDate">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.unLoadDate" placeholder="卸箱时间" />
-            </template>
-          </el-table-column>
-          <el-table-column label="计划货量" align="center" prop="cntrQty">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.cntrQty" placeholder="计划货量" />
-            </template>
-          </el-table-column>
-          <el-table-column label="已调度货量" align="center" prop="cntrPlanQty">
-            <template slot-scope="scope">
-              <el-input
-                v-model="scope.row.cntrPlanQty"
-                placeholder="已调度货量"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="已派车货量" align="center" prop="cntrBlcQty">
-            <template slot-scope="scope">
-              <el-input
-                v-model="scope.row.cntrBlcQty"
-                placeholder="已派车货量"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" align="center" prop="remarks">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.remarks" placeholder="备注" />
-            </template>
-          </el-table-column>
+                <el-table-column label="运价" align="center" prop="pricecr">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.pricecr" placeholder="运价" />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="卸箱场站"
+                  align="center"
+                  prop="unLoadAddr"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.unLoadAddr"
+                      placeholder="卸箱场站"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="卸箱时间"
+                  align="center"
+                  prop="unLoadDate"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.unLoadDate"
+                      placeholder="卸箱时间"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column label="计划货量" align="center" prop="cntrQty">
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.cntrQty"
+                      placeholder="计划货量"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="已调度货量"
+                  align="center"
+                  prop="cntrPlanQty"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.cntrPlanQty"
+                      placeholder="已调度货量"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="已派车货量"
+                  align="center"
+                  prop="cntrBlcQty"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-model="scope.row.cntrBlcQty"
+                      placeholder="已派车货量"
+                    />
+                  </template>
+                </el-table-column>
+                <el-table-column label="备注" align="center" prop="remarks">
+                  <template slot-scope="scope">
+                    <el-input v-model="scope.row.remarks" placeholder="备注" />
+                  </template>
+                </el-table-column>
 
-          <el-table-column
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-            width="100"
-          >
-            <template slot-slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click.native.prevent="deleteRow(scope.$index, planList)"
-                >删除</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
+                <el-table-column
+                  label="操作"
+                  align="center"
+                  class-name="small-padding fixed-width"
+                  width="100"
+                >
+                  <template slot-scope="scope">
+                    <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-delete"
+                      @click.native.prevent="deleteRow(scope.$index, planList)"
+                      >删除</el-button
+                    >
+                  </template>
+                </el-table-column>
+              </el-table>
             </div>
           </el-collapse-item>
           <el-collapse-item>
@@ -444,7 +479,7 @@
                   align="center"
                   label="附件名称"
                 >
-                  <template slot-slot-scope="scope">
+                  <template slot-scope="scope">
                     <el-input
                       v-model="scope.row.attachName"
                       placeholder="附件名称"
@@ -458,7 +493,7 @@
                   align="center"
                   label="上传人"
                 >
-                  <template slot-slot-scope="scope">
+                  <template slot-scope="scope">
                     <el-input
                       v-model="scope.row.opuserID"
                       placeholder="上传人"
@@ -472,7 +507,7 @@
                   align="center"
                   label="上传时间"
                 >
-                  <template slot-slot-scope="scope">
+                  <template slot-scope="scope">
                     <el-date-picker
                       v-model="scope.row.opdata"
                       type="date"
@@ -489,7 +524,7 @@
                   align="center"
                   label="上传附件"
                 >
-                  <template slot-slot-scope="scope">
+                  <template slot-scope="scope">
                     <uploadFile
                       @input="showFile"
                       v-model="scope.row.attachUrl"
@@ -502,143 +537,13 @@
                   label="操作"
                   width="130PX"
                 >
-                  <template slot-slot-scope="scope">
-                    <el-button
-                      size="mini"
-                      type="text"
-                      icon="el-icon-delete"
-                      @click.native.prevent="
-                        deleteRow(scope.$index, relevantAttachments)
-                      "
-                      >删除</el-button
-                    >
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-          </el-collapse-item>
-          <el-collapse-item v-if="userType == '00'">
-            <template slot="title">
-              <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
-                ><span
-                  style="font-size: 16px; font-weight: bolder; margin-left: 5px"
-                  >预计费用明细</span
-                >
-              </i>
-            </template>
-            <div>
-              <div
-                style="
-                  display: flex;
-                  justify-content: space-between;
-                  margin: 10px 0;
-                "
-              >
-                <div>
-                  <el-button
-                    type="primary"
-                    icon="el-icon-plus"
-                    size="mini"
-                    @click="addRow(detailList)"
-                    :disabled="disabled"
-                    >添加</el-button
-                  >
-                </div>
-              </div>
-              <el-table :data="detailList" v-if="userType == '00'">
-                <el-table-column label="结算单位" align="center" prop="cntrId">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.cntrId"
-                      placeholder="结算单位"
-                    />
-                  </template>
-                </el-table-column>
-
-                <el-table-column
-                  label="费用名称"
-                  align="center"
-                  prop="priceType"
-                >
                   <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.priceType"
-                      placeholder="费用名称"
-                    />
-                  </template>
-                </el-table-column>
-
-                <el-table-column label="收付" align="center" prop="dc">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.dc" placeholder="收付" />
-                  </template>
-                </el-table-column>
-                <el-table-column label="计费单位" align="center" prop="priceCr">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.priceCr"
-                      placeholder="计费单位"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column label="计费数量" align="center" prop="qty">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.qty" placeholder="计费数量" />
-                  </template>
-                </el-table-column>
-                <el-table-column label="单价" align="center" prop="price">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.price" placeholder="单价" />
-                  </template>
-                </el-table-column>
-                <el-table-column label="币种" align="center" prop="cntrBlcQty">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.cntrBlcQty"
-                      placeholder="币种"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column label="税率" align="center" prop="cntrBlcQty">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.cntrBlcQty"
-                      placeholder="税率"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column label="金额" align="center" prop="amt">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.amt" placeholder="金额" />
-                  </template>
-                </el-table-column>
-                <el-table-column label="税率" align="center" prop="cntrBlcQty">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.cntrBlcQty"
-                      placeholder="税率"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column label="备注" align="center" prop="remarks">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.remarks" placeholder="备注" />
-                  </template>
-                </el-table-column>
-
-                <el-table-column
-                  label="操作"
-                  align="center"
-                  class-name="small-padding fixed-width"
-                  width="100"
-                >
-                  <template slot-slot-scope="scope">
                     <el-button
                       size="mini"
                       type="text"
                       icon="el-icon-delete"
                       @click.native.prevent="
-                        deleteRow(scope.$index, detailList)
+                        deleteRow(scope.$index, relevantAttachments)
                       "
                       >删除</el-button
                     >
@@ -731,7 +636,7 @@
                   class-name="small-padding fixed-width"
                   width="100"
                 >
-                  <template slot-slot-scope="scope">
+                  <template slot-scope="scope">
                     <el-button
                       size="mini"
                       type="text"
@@ -910,7 +815,7 @@ export default {
     handleClose() {
       // 子组件调用父组件方法，并传递参数
       this.$emit("changeShow", "false");
-      this. fMblnoOptions=[]
+      this.fMblnoOptions = [];
     },
     /** 提交按钮 */
     submitForm() {
@@ -1003,8 +908,8 @@ export default {
     corpsRemoteMethod(name) {
       console.log(name);
       if (name == null || name === "") {
-        this.fMblnoOptions =[]
-        return
+        this.fMblnoOptions = [];
+        return;
       }
       let queryParams = { pageNum: 1, pageSize: 10, fName: name, type: 1 };
       listCorps(queryParams).then((response) => {