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

src/views/fleet/plans/AddOrUpdate.vue

@@ -17,7 +17,7 @@
                 filterable
                 :disabled="disabled"
                 size="mini"
-                style="width:180px"
+                style="width: 180px"
               >
                 <el-option
                   v-for="(dict, index) in fMblnoOptions"
@@ -34,8 +34,8 @@
                 v-model="form.billType"
                 placeholder="请选择业务类型"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               >
                 <el-option
                   v-for="(dict, index) in billTypeList"
@@ -52,8 +52,8 @@
                 v-model="form.transType"
                 placeholder="请选择运输方式"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               >
                 <el-option
                   v-for="(dict, index) in transTypeList"
@@ -70,8 +70,8 @@
                 v-model="form.transProp"
                 placeholder="请选择运输方式"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               >
                 <el-option
                   v-for="(dict, index) in transPropList"
@@ -90,8 +90,8 @@
                 v-model="form.mblno"
                 placeholder="请输入提单号"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -103,8 +103,8 @@
                 :disabled="disabled"
                 clearable
                 filterable
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               >
                 <el-option
                   v-for="(dict, index) in goodsOptions"
@@ -122,8 +122,8 @@
                 placeholder="请输入计划件数"
                 :disabled="disabled"
                 v-input-limit="2"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -134,8 +134,8 @@
                 placeholder="请输入计划重量"
                 :disabled="disabled"
                 v-input-limit="2"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -147,8 +147,8 @@
                 v-model="form.ysl"
                 placeholder="请输入船名"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -158,8 +158,8 @@
                 v-model="form.voy"
                 placeholder="请输入航次"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -169,8 +169,8 @@
                 v-model="form.pol"
                 placeholder="请输入起运港"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -180,8 +180,8 @@
                 v-model="form.pod"
                 placeholder="请输入目的港"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -197,8 +197,8 @@
                 v-model="form.loadAddr"
                 placeholder="请输入提箱地点"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
             <el-form-item v-else label="装货地点" prop="loadAddr">
@@ -206,7 +206,7 @@
                 v-model="form.loadAddr"
                 placeholder="请输入装货地点"
                 :disabled="disabled"
-                 size="mini"
+                size="mini"
               />
             </el-form-item>
           </el-col>
@@ -231,8 +231,8 @@
                 v-model="form.loadAttn"
                 placeholder="请输入装车联系人"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -243,8 +243,8 @@
                 placeholder="请输入装车联系电话"
                 :disabled="disabled"
                 v-input-limit="0"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -260,8 +260,8 @@
                 v-model="form.mdLoadAddr"
                 placeholder="请输入装卸货地点"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
             <el-form-item
@@ -273,8 +273,8 @@
                 v-model="form.mdLoadAddr"
                 placeholder="请输入装货地点"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -299,8 +299,8 @@
                 v-model="form.mdLoadAttn"
                 placeholder="请输入装卸货联系人"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -311,8 +311,8 @@
                 placeholder="请输入装卸货联系电话"
                 :disabled="disabled"
                 v-input-limit="0"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -324,8 +324,8 @@
                 v-model="form.unLoadAddr"
                 placeholder="请输入卸箱地点"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -335,8 +335,8 @@
                 v-model="form.unLoadAddr"
                 placeholder="请输入卸箱地点"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -361,8 +361,8 @@
                 v-model="form.unLoadAttn"
                 placeholder="请输入卸车联系人"
                 :disabled="disabled"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -373,8 +373,8 @@
                 placeholder="请输入卸车联系电话"
                 :disabled="disabled"
                 v-input-limit="0"
-                 size="mini"
-                 style="width:180px"
+                size="mini"
+                style="width: 180px"
               />
             </el-form-item>
           </el-col>
@@ -389,7 +389,6 @@
                 placeholder="请输入线路描述"
                 :disabled="disabled"
                 size="mini"
-                style="width:180px"
               />
             </el-form-item>
           </el-col>
@@ -404,16 +403,15 @@
                 placeholder="请输入备注"
                 :disabled="disabled"
                 size="mini"
-                style="width:180px"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <div style="display: flex; justify-content: flex-end; margin: 10px 0">
+        <!-- <div style="display: flex; justify-content: flex-end; margin: 10px 0">
           <el-button type="danger" @click="submitAllowChanges"
             >申请修改</el-button
           >
-        </div>
+        </div> -->
         <el-collapse v-model="collapses">
           <el-collapse-item>
             <template slot="title">
@@ -769,6 +767,7 @@
                       placeholder="费用名称"
                       clearable
                       filterable
+                      :disabled="disabled"
                     >
                       <el-option
                         v-for="(dict, index) in fWbuOptions"
@@ -782,21 +781,15 @@
                 <el-table-column
                   label="计费单位"
                   align="center"
-                  prop="ffeeunitid"
+                  prop="fFeeunitid"
                 >
                   <template slot-scope="scope">
-                    <el-select
-                      v-model="scope.row.ffeeunitid"
+                    <el-input
+                      v-model="scope.row.fFeeunitid"
                       placeholder="计费单位"
+                      v-input-limit="0"
                       :disabled="disabled"
-                    >
-                      <el-option
-                        v-for="(dict, index) in priceTypeList"
-                        :key="index.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                      />
-                    </el-select>
+                    />
                   </template>
                 </el-table-column>
                 <el-table-column label="计费数量" align="center" prop="fqty">
@@ -805,6 +798,7 @@
                       v-model="scope.row.fqty"
                       placeholder="计费数量"
                       v-input-limit="0"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
@@ -814,23 +808,17 @@
                       v-model="scope.row.funitprice"
                       placeholder="单价"
                       v-input-limit="2"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
                 <el-table-column label="币种" align="center" prop="fcurrency">
                   <template slot-scope="scope">
-                    <el-select
+                    <el-input
                       v-model="scope.row.fcurrency"
-                      placeholder="请选择币种"
-                    >
-                      <el-option
-                        v-for="item in currencyList"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      >
-                      </el-option>
-                    </el-select>
+                      placeholder="RMB"
+                      :disabled="true"
+                    />
                   </template>
                 </el-table-column>
                 <el-table-column label="税率" align="center" prop="ftaxrate">
@@ -839,6 +827,7 @@
                       v-model="scope.row.ftaxrate"
                       placeholder="税率"
                       v-input-limit="2"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
@@ -848,6 +837,7 @@
                       v-model="scope.row.famount"
                       placeholder="金额"
                       v-input-limit="2"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
@@ -857,12 +847,17 @@
                       v-model="scope.row.fexrate"
                       placeholder="汇率"
                       v-input-limit="2"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
                 <el-table-column label="备注" align="center" prop="remark">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.remark" placeholder="备注" />
+                    <el-input
+                      v-model="scope.row.remark"
+                      placeholder="备注"
+                      :disabled="disabled"
+                    />
                   </template>
                 </el-table-column>
 
@@ -941,6 +936,7 @@
                       placeholder="费用名称"
                       clearable
                       filterable
+                      :disabled="disabled"
                     >
                       <el-option
                         v-for="(dict, index) in fWbuOptions"
@@ -954,12 +950,14 @@
                 <el-table-column
                   label="计费单位"
                   align="center"
-                  prop="ffeeunitid"
+                  prop="fFeeunitid"
                 >
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.ffeeunitid"
+                      v-model="scope.row.fFeeunitid"
                       placeholder="计费单位"
+                      v-input-limit="0"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
@@ -969,6 +967,7 @@
                       v-model="scope.row.fqty"
                       placeholder="计费数量"
                       v-input-limit="0"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
@@ -978,23 +977,17 @@
                       v-model="scope.row.funitprice"
                       placeholder="单价"
                       v-input-limit="2"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
                 <el-table-column label="币种" align="center" prop="fcurrency">
                   <template slot-scope="scope">
-                    <el-select
+                    <el-input
                       v-model="scope.row.fcurrency"
-                      placeholder="请选择币种"
-                    >
-                      <el-option
-                        v-for="item in currencyList"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      >
-                      </el-option>
-                    </el-select>
+                      placeholder="RMB"
+                      :disabled="true"
+                    />
                   </template>
                 </el-table-column>
                 <el-table-column label="税率" align="center" prop="ftaxrate">
@@ -1003,6 +996,7 @@
                       v-model="scope.row.ftaxrate"
                       placeholder="税率"
                       v-input-limit="2"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
@@ -1012,6 +1006,7 @@
                       v-model="scope.row.famount"
                       placeholder="金额"
                       v-input-limit="2"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
@@ -1021,12 +1016,17 @@
                       v-model="scope.row.fexrate"
                       placeholder="汇率"
                       v-input-limit="2"
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
                 <el-table-column label="备注" align="center" prop="remark">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.remark" placeholder="备注" />
+                    <el-input
+                      v-model="scope.row.remark"
+                      placeholder="备注"
+                      :disabled="disabled"
+                    />
                   </template>
                 </el-table-column>
 
@@ -1078,14 +1078,13 @@
                   >
                 </div>
               </div>
-              {{schedulingList}}
               <el-table :data="schedulingList" v-if="userType == '00'">
                 <el-table-column label="箱型" align="center" prop="cntrId">
                   <template slot-scope="scope">
                     <el-select
                       v-model="scope.row.cntrId"
                       placeholder="请选择箱型"
-                      :disabled="disabled||scope.row.billStatus==6"
+                      :disabled="disabled || scope.row.billStatus == 6"
                       @change="checkPid(scope.row)"
                     >
                       <el-option
@@ -1107,7 +1106,7 @@
                     <el-input
                       v-model="scope.row.carcorPid"
                       placeholder="车队名称"
-                      :disabled="disabled||scope.row.billStatus==6"
+                      :disabled="disabled || scope.row.billStatus == 6"
                     />
                   </template>
                 </el-table-column>
@@ -1123,7 +1122,7 @@
                       v-model="scope.row.cntrQty"
                       placeholder="调度安排货量"
                       v-input-limit="2"
-                      :disabled="disabled||scope.row.billStatus==6"
+                      :disabled="disabled || scope.row.billStatus == 6"
                     />
                   </template>
                 </el-table-column>
@@ -1145,7 +1144,7 @@
                     <el-input
                       v-model="scope.row.remarks"
                       placeholder="备注"
-                      :disabled="disabled||scope.row.billStatus==6"
+                      :disabled="disabled || scope.row.billStatus == 6"
                     />
                   </template>
                 </el-table-column>
@@ -1164,7 +1163,7 @@
                       @click.native.prevent="
                         delplansRow(scope.$index, schedulingList, scope.row)
                       "
-                      :disabled="disabled||scope.row.billStatus==6"
+                      :disabled="disabled || scope.row.billStatus == 6"
                       >删除</el-button
                     >
                     <el-button
@@ -1172,7 +1171,7 @@
                       type="text"
                       icon="el-icon-document-checked"
                       @click.native.prevent="addplansRow(scope.row)"
-                      :disabled="disabled||scope.row.billStatus==6"
+                      :disabled="disabled || scope.row.billStatus == 6"
                       >提交</el-button
                     >
                     <el-button
@@ -1197,7 +1196,8 @@
       <el-button type="primary" @click="submitForm" :disabled="disabled"
         >提交</el-button
       >
-      <el-button type="success" @click="submitFix">修改</el-button>
+      <!-- <el-button type="success" @click="submitFix">修改</el-button> -->
+      <el-button type="success" @click="submitAllowChanges">修改</el-button>
       <el-button type="info" @click="submitSave" :disabled="disabled"
         >保 存</el-button
       >
@@ -1366,10 +1366,10 @@ export default {
   },
   methods: {
     //选中时赋值pid
-    checkPid(row){
-        let arr = this.planList;
-        let arr2 = arr.filter((e) => e.cntrId == row.cntrId);
-        row["pid"] = arr2[0].id;
+    checkPid(row) {
+      let arr = this.planList;
+      let arr2 = arr.filter((e) => e.cntrId == row.cntrId);
+      row["pid"] = arr2[0].id;
     },
     noMorecntrId(e) {
       this.cntrIdList.forEach((item) => (item.noOption = false));
@@ -1430,7 +1430,7 @@ export default {
       // 子组件调用父组件方法，并传递参数
       this.$emit("changeShow", "false");
       this.cntrIdList.forEach((item) => (item.noOption = false));
-      // this.fMblnoOptions = [];
+      this.collapses = [];
     },
     /** 提交按钮 */
     submitForm() {
@@ -1442,9 +1442,15 @@ export default {
             this.DList.map((e) => {
               return (e.fDc = "D");
             });
+            this.DList.map((e) => {
+              return (e.fcurrency = "RMB");
+            });
             this.CList.map((e) => {
               return (e.fDc = "C");
             });
+            this.CList.map((e) => {
+              return (e.fcurrency = "RMB");
+            });
             let formData = new window.FormData();
             formData.append("tmsorder", JSON.stringify(this.form));
             formData.append(
@@ -1476,9 +1482,15 @@ export default {
             this.DList.map((e) => {
               return (e.fDc = "D");
             });
+            this.DList.map((e) => {
+              return (e.fcurrency = "RMB");
+            });
             this.CList.map((e) => {
               return (e.fDc = "C");
             });
+            this.CList.map((e) => {
+              return (e.fcurrency = "RMB");
+            });
             let formData = new window.FormData();
             formData.append("tmsorder", JSON.stringify(this.form));
             formData.append(
@@ -1503,11 +1515,23 @@ export default {
     //保存
     submitSave() {
       this.form["billStatus"] = "2";
+      this.DList.map((e) => {
+        return (e.fDc = "D");
+      });
+      this.DList.map((e) => {
+        return (e.fcurrency = "RMB");
+      });
+      this.CList.map((e) => {
+        return (e.fDc = "C");
+      });
+      this.CList.map((e) => {
+        return (e.fcurrency = "RMB");
+      });
       let formData = new window.FormData();
       formData.append("tmsorder", JSON.stringify(this.form));
       formData.append("attachs", JSON.stringify(this.relevantAttachments));
       formData.append("scntrs", JSON.stringify(this.planList));
-      formData.append("fees", JSON.stringify(this.DList));
+      formData.append("fees", JSON.stringify(this.DList.concat(this.CList)));
       formData.append("plans", JSON.stringify(this.schedulingList));
       addFtmsorderbills(formData).then((response) => {
         if (response.code == 200) {
@@ -1521,9 +1545,11 @@ export default {
     submitRetreat() {
       const id = { id: this.form.id };
       RetreatFtmsorderbills(id).then((response) => {
-        this.msgSuccess("撤回成功");
-        this.$parent.getList();
-        this.showDialog = false;
+        if (response.code == 200) {
+          this.msgSuccess("撤回成功");
+          this.$parent.getList();
+          this.$emit("fixDisabled", "false");
+        }
       });
     },
     //修改
@@ -1535,6 +1561,7 @@ export default {
             this.msgSuccess("不允许修改");
           } else {
             this.$emit("fixDisabled", "false");
+            this.msgSuccess("允许修改");
           }
         });
       } else {
@@ -1581,8 +1608,8 @@ export default {
           this.msgSuccess("成功提交");
           if (response.code == 200) {
             // row["billStatus"] = response.data.billStatus;
-            this.$set(row, 'id', response.data.id)
-            this.$set(row, 'billStatus', response.data.billStatus)
+            this.$set(row, "id", response.data.id);
+            this.$set(row, "billStatus", response.data.billStatus);
           }
         });
       } else {
@@ -1590,8 +1617,7 @@ export default {
       }
     },
     delplansRow(index, rows, row) {
-
-      if (row.billStatus != 6&&row.id!=null) {
+      if (row.billStatus != 6 && row.id != null) {
         removeFtmsorderbillsplans(row).then((response) => {
           if (response.code == 200) {
             rows.splice(index, 1);
@@ -1607,10 +1633,10 @@ export default {
         revokeFtmsorderbillsplans(row).then((response) => {
           if (response.code == 200) {
             this.msgSuccess("成功撤回");
-            this.$set(row, 'billStatus', response.data.billStatus)
+            this.$set(row, "billStatus", response.data.billStatus);
           }
         });
-      }else{
+      } else {
         this.msgSuccess("此条数据没有提交，不能申请撤回");
       }
     },

src/views/fleet/plans/index.vue

@@ -126,6 +126,7 @@
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
+          style="margin-left:30px"
           >搜索</el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
@@ -149,7 +150,7 @@
           type="success"
           icon="el-icon-edit"
           size="mini"
-          :disabled="single"
+          :disabled="true"
           @click="handleUpdate"
           v-hasPermi="['fleet:plans:edit']"
           >修改</el-button