修改3.29的问题

src/layout/components/Sidebar/Logo.vue

@@ -83,9 +83,9 @@ export default {
       margin-right: 12px;
     }
     & .sidebar-logo-mini {
-      height: 18px;
+      height: 50px;
       vertical-align: middle;
-      margin-right: 12px;
+      margin: auto;
     }
     & .sidebar-title {
       display: inline-block;

src/views/fleet/plans/AddOrUpdate.vue

@@ -1176,20 +1176,22 @@
                       v-model="scope.row.attachName"
                       placeholder="附件名称"
                       show-word-limit
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="opuserID "
+                  prop="createBy "
                   header-align="center"
                   align="center"
                   label="上传人"
                 >
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.opuserID"
+                      v-model="scope.row.createBy"
                       placeholder="上传人"
                       show-word-limit
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
@@ -1356,6 +1358,10 @@ export default {
       type: Array,
       default: [],
     },
+    relevantAttachments:{
+      type: Array,
+      default: [],
+    }
   },
   components: {
     UploadFile,
@@ -1420,7 +1426,6 @@ export default {
       transTypeList: [],
       transPropList: [],
       goodsLossTypeList: [],
-      relevantAttachments: [],
       cntrIdList: [],
       priceTypeList: [],
       userType: null,
@@ -1523,7 +1528,7 @@ export default {
       this.relevantAttachments.push({
         attachUrl: null,
         attachName: null,
-        opuserID: this.username,
+        createBy: this.username,
         opdata: Date.parse(new Date()),
       });
     },

src/views/fleet/plans/index.vue

@@ -378,6 +378,7 @@
       :DList="DList"
       :CList="CList"
       :schedulingList="schedulingList"
+      :relevantAttachments="relevantAttachments"
       :collapses="collapses"
       @changeShow="showAddOrUpdate"
       @fixDisabled="fixDisabled"
@@ -650,6 +651,7 @@ export default {
       goodsOptions: [],
       show: false,
       collapses: [],
+      relevantAttachments:[]
     };
   },
   // 使用子组件
@@ -839,6 +841,7 @@ export default {
       this.DList = [];
       this.CList = [];
       this.schedulingList = [];
+      this.relevantAttachments=[];
       this.disabled = false;
       this.collapses = ["1"];
     },
@@ -897,6 +900,7 @@ export default {
           this.CList = [];
         }
         this.schedulingList = response.data.plans;
+        this.relevantAttachments=response.data.attach;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
       });
     },

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -785,7 +785,7 @@
                     icon="el-icon-plus"
                     size="mini"
                     @click="addDListRow(DList)"
-                    :disabled="disabled"
+                    :disabled="disabled2"
                     >添加</el-button
                   >
                 </div>
@@ -798,7 +798,7 @@
                       placeholder="结算单位"
                       :clearable="true"
                       filterable
-                      :disabled="disabled"
+                      :disabled="disabled2"
                     >
                       <el-option
                         v-for="(dict, index) in fMblnoOptions"
@@ -817,7 +817,7 @@
                       placeholder="费用名称"
                       clearable
                       filterable
-                      :disabled="disabled"
+                      :disabled="disabled2"
                     >
                       <el-option
                         v-for="(dict, index) in fWbuOptions"
@@ -837,7 +837,7 @@
                     <el-select
                       v-model="scope.row.fFeeunitid"
                       placeholder="计费单位"
-                      :disabled="disabled"
+                      :disabled="disabled2"
                     >
                       <el-option
                         v-for="(dict, index) in ffeeunitidList"
@@ -854,7 +854,7 @@
                       v-model="scope.row.fQty"
                       placeholder="计费数量"
                       v-input-limit="0"
-                      :disabled="disabled"
+                      :disabled="disabled2"
                       @input="total(scope.row)"
                     />
                   </template>
@@ -865,7 +865,7 @@
                       v-model="scope.row.fUnitprice"
                       placeholder="单价"
                       v-input-limit="2"
-                      :disabled="disabled"
+                      :disabled="disabled2"
                       @input="total(scope.row)"
                     />
                   </template>
@@ -885,7 +885,7 @@
                       v-model="scope.row.fExrate"
                       placeholder="汇率"
                       v-input-limit="2"
-                      :disabled="disabled"
+                      :disabled="disabled2"
                     />
                   </template>
                 </el-table-column>
@@ -905,7 +905,7 @@
                       v-model="scope.row.fTaxrate"
                       placeholder="税率"
                       v-input-limit="2"
-                      :disabled="disabled"
+                      :disabled="disabled2"
                     />
                   </template>
                 </el-table-column>
@@ -915,7 +915,7 @@
                     <el-input
                       v-model="scope.row.remarks"
                       placeholder="备注"
-                      :disabled="disabled"
+                      :disabled="disabled2"
                     />
                   </template>
                 </el-table-column>
@@ -932,7 +932,7 @@
                       type="text"
                       icon="el-icon-delete"
                       @click.native.prevent="deleteRow(scope.$index, DList)"
-                      :disabled="disabled"
+                      :disabled="disabled2"
                       >删除</el-button
                     >
                   </template>
@@ -963,7 +963,7 @@
                     icon="el-icon-plus"
                     size="mini"
                     @click="addDListRow(CList)"
-                    :disabled="disabled"
+                    :disabled="disabled2"
                     >添加</el-button
                   >
                 </div>
@@ -976,7 +976,7 @@
                       placeholder="结算单位"
                       :clearable="true"
                       filterable
-                      :disabled="disabled"
+                      :disabled="disabled2"
                     >
                       <el-option
                         v-for="(dict, index) in fMblnoOptions"
@@ -995,7 +995,7 @@
                       placeholder="费用名称"
                       clearable
                       filterable
-                      :disabled="disabled"
+                      :disabled="disabled2"
                     >
                       <el-option
                         v-for="(dict, index) in fWbuOptions"
@@ -1015,7 +1015,7 @@
                     <el-select
                       v-model="scope.row.fFeeunitid"
                       placeholder="计费单位"
-                      :disabled="disabled"
+                      :disabled="disabled2"
                     >
                       <el-option
                         v-for="(dict, index) in ffeeunitidList"
@@ -1032,7 +1032,7 @@
                       v-model="scope.row.fQty"
                       placeholder="计费数量"
                       v-input-limit="0"
-                      :disabled="disabled"
+                      :disabled="disabled2"
                       @input="total(scope.row)"
                     />
                   </template>
@@ -1043,7 +1043,7 @@
                       v-model="scope.row.fUnitprice"
                       placeholder="单价"
                       v-input-limit="2"
-                      :disabled="disabled"
+                      :disabled="disabled2"
                       @input="total(scope.row)"
                     />
                   </template>
@@ -1063,7 +1063,7 @@
                       v-model="scope.row.fExrate"
                       placeholder="汇率"
                       v-input-limit="2"
-                      :disabled="disabled"
+                      :disabled="disabled2"
                     />
                   </template>
                 </el-table-column>
@@ -1083,7 +1083,7 @@
                       v-model="scope.row.fTaxrate"
                       placeholder="税率"
                       v-input-limit="2"
-                      :disabled="disabled"
+                      :disabled="disabled2"
                     />
                   </template>
                 </el-table-column>
@@ -1093,7 +1093,7 @@
                     <el-input
                       v-model="scope.row.remarks"
                       placeholder="备注"
-                      :disabled="disabled"
+                      :disabled="disabled2"
                     />
                   </template>
                 </el-table-column>
@@ -1110,7 +1110,7 @@
                       type="text"
                       icon="el-icon-delete"
                       @click.native.prevent="deleteRow(scope.$index, DList)"
-                      :disabled="disabled"
+                      :disabled="disabled2"
                       >删除</el-button
                     >
                   </template>
@@ -1141,7 +1141,7 @@
                     icon="el-icon-plus"
                     size="mini"
                     @click="addRelevt"
-                    :disabled="disabled"
+                    :disabled="disabled2"
                     >添加</el-button
                   >
                 </div>
@@ -1167,22 +1167,22 @@
                       v-model="scope.row.attachName"
                       placeholder="附件名称"
                       show-word-limit
-                      :disabled="disabled"
+                      :disabled="disabled2"
                     />
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="opuserID "
+                  prop="createBy "
                   header-align="center"
                   align="center"
                   label="上传人"
                 >
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.opuserID"
+                      v-model="scope.row.createBy"
                       placeholder="上传人"
                       show-word-limit
-                      :disabled="disabled"
+                      :disabled="disabled2"
                     />
                   </template>
                 </el-table-column>
@@ -1199,7 +1199,7 @@
                       placeholder="上传时间"
                       format="yyyy-MM-dd HH:mm"
                       value-format="timestamp"
-                      :disabled="disabled"
+                      :disabled="disabled2"
                     ></el-date-picker>
                   </template>
                 </el-table-column>
@@ -1220,11 +1220,11 @@
                           }
                         "
                         :headers="headers"
-                        :disabled="disabled"
+                        :disabled="disabled2"
                         :show-file-list="false"
                         :limit="1"
                       >
-                        <el-button size="small" type="text" :disabled="disabled"
+                        <el-button size="small" type="text" :disabled="disabled2"
                           >点击上传</el-button
                         >
                       </el-upload>
@@ -1232,14 +1232,14 @@
                         size="small"
                         type="text"
                         @click="checkFile(scope)"
-                        :disabled="disabled"
+                        :disabled="disabled2"
                         style="margin-left: 10px"
                         >查看</el-button
                       >
                       <el-button
                         size="small"
                         type="text"
-                        :disabled="disabled"
+                        :disabled="disabled2"
                         @click="deleteFile(scope)"
                         >删除</el-button
                       >
@@ -1260,7 +1260,7 @@
                       @click.native.prevent="
                         deleteRow(scope.$index, relevantAttachments)
                       "
-                      :disabled="disabled"
+                      :disabled="disabled2 "
                       >删除</el-button
                     >
                   </template>
@@ -1353,6 +1353,10 @@ export default {
       type: Array,
       default: [],
     },
+    relevantAttachments: {
+      type: Array,
+      default: [],
+    },
   },
   components: {
     UploadFile,
@@ -1417,7 +1421,6 @@ export default {
       transTypeList: [],
       transPropList: [],
       goodsLossTypeList: [],
-      relevantAttachments: [],
       cntrIdList: [],
       priceTypeList: [],
       userType: null,
@@ -1514,7 +1517,7 @@ export default {
       this.relevantAttachments.push({
         attachUrl: null,
         attachName: null,
-        opuserID: this.username,
+        createBy: this.username,
         opdata: Date.parse(new Date()),
       });
     },

src/views/fleet/scheduling/index.vue

@@ -355,6 +355,7 @@
       :CList="CList"
       :schedulingList="schedulingList"
       :collapses="collapses"
+      :relevantAttachments="relevantAttachments"
       @changeShow="showAddOrUpdate"
       @fixDisabled="fixDisabled"
       @fixDisabled2="fixDisabled2"
@@ -414,6 +415,7 @@ export default {
       billTypeList: [],
       transTypeList: [],
       transPropList: [],
+      relevantAttachments:[],
       showSetting: false,
       drag: false,
       setRowList: [
@@ -836,6 +838,7 @@ export default {
       this.disabled = false;
       this.disabled2 = false;
       this.collapses = ["1", "2"];
+      this.relevantAttachments=[];
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -898,6 +901,7 @@ export default {
           this.CList = [];
         }
         this.schedulingList = response.data.plans;
+        this.relevantAttachments=response.data.attach;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
       });
     },

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -16,7 +16,7 @@
                 placeholder="请输入客户名称"
                 :clearable="true"
                 filterable
-                :disabled="disabled"
+                disabled
                 size="mini"
                 style="width: 180px"
               >
@@ -34,7 +34,7 @@
               <el-select
                 v-model="form.billType"
                 placeholder="请选择业务类型"
-                :disabled="disabled"
+                disabled
                 size="mini"
                 style="width: 180px"
               >
@@ -52,7 +52,7 @@
               <el-select
                 v-model="form.transType"
                 placeholder="请选择运输方式"
-                :disabled="disabled"
+                disabled
                 size="mini"
                 style="width: 180px"
               >
@@ -70,7 +70,7 @@
               <el-select
                 v-model="form.transProp"
                 placeholder="请选择运输方式"
-                :disabled="disabled"
+                disabled
                 size="mini"
                 style="width: 180px"
               >
@@ -90,7 +90,7 @@
               <el-input
                 v-model="form.mblno"
                 placeholder="请输入提单号"
-                :disabled="disabled"
+                disabled
                 size="mini"
                 style="width: 180px"
               />
@@ -101,7 +101,7 @@
               <el-select
                 v-model="form.goodsId"
                 placeholder="请输入货品名称"
-                :disabled="disabled"
+                disabled
                 clearable
                 filterable
                 size="mini"
@@ -121,7 +121,7 @@
               <el-input
                 v-model="form.qtyPlan"
                 placeholder="请输入计划件数"
-                :disabled="disabled"
+                disabled
                 v-input-limit="2"
                 size="mini"
                 style="width: 180px"
@@ -133,7 +133,7 @@
               <el-input
                 v-model="form.weightPlan"
                 placeholder="请输入计划重量"
-                :disabled="disabled"
+                disabled
                 v-input-limit="2"
                 size="mini"
                 style="width: 180px"
@@ -147,7 +147,7 @@
               <el-input
                 v-model="form.ysl"
                 placeholder="请输入船名"
-                :disabled="disabled"
+                disabled
                 size="mini"
                 style="width: 180px"
               />
@@ -158,7 +158,7 @@
               <el-input
                 v-model="form.voy"
                 placeholder="请输入航次"
-                :disabled="disabled"
+                disabled
                 size="mini"
                 style="width: 180px"
               />
@@ -171,7 +171,7 @@
                 placeholder="请输入起运港"
                 :clearable="true"
                 filterable
-                :disabled="disabled"
+                disabled
                 size="mini"
                 style="width: 180px"
               >
@@ -191,7 +191,7 @@
                 placeholder="请输入目的港"
                 :clearable="true"
                 filterable
-                :disabled="disabled"
+                disabled
                 size="mini"
                 style="width: 180px"
               >
@@ -215,7 +215,7 @@
               <el-input
                 v-model="form.loadAddr"
                 placeholder="请输入提箱地点"
-                :disabled="disabled"
+                disabled
                 size="mini"
                 style="width: 180px"
               />
@@ -224,7 +224,7 @@
               <el-input
                 v-model="form.loadAddr"
                 placeholder="请输入装货地点"
-                :disabled="disabled"
+                disabled
                 size="mini"
               />
             </el-form-item>
@@ -238,7 +238,7 @@
                 v-model="form.loadDate"
                 type="datetime"
                 placeholder="选择计划装车时间"
-                :disabled="disabled"
+                disabled
               >
               </el-date-picker>
             </el-form-item>
@@ -248,7 +248,7 @@
               <el-input
                 v-model="form.loadAttn"
                 placeholder="请输入装车联系人"
-                :disabled="disabled"
+                disabled
                 size="mini"
                 style="width: 180px"
               />
@@ -259,7 +259,7 @@
               <el-input
                 v-model="form.loadAttntel"
                 placeholder="请输入装车联系电话"
-                :disabled="disabled"
+                disabled
                 v-input-limit="0"
                 size="mini"
                 style="width: 180px"
@@ -277,7 +277,7 @@
               <el-input
                 v-model="form.mdLoadAddr"
                 placeholder="请输入装卸货地点"
-                :disabled="disabled"
+                disabled
                 size="mini"
                 style="width: 180px"
               />
@@ -290,7 +290,7 @@
               <el-input
                 v-model="form.mdLoadAddr"
                 placeholder="请输入装货地点"
-                :disabled="disabled"
+                disabled
                 size="mini"
                 style="width: 180px"
               />
@@ -305,7 +305,7 @@
                 v-model="form.mdLoadDate"
                 type="datetime"
                 placeholder="选择计划装卸货时间"
-                :disabled="disabled"
+                disabled
               >
               </el-date-picker>
             </el-form-item>
@@ -315,7 +315,7 @@
               <el-input
                 v-model="form.mdLoadAttn"
                 placeholder="请输入装卸货联系人"
-                :disabled="disabled"
+                disabled
                 size="mini"
                 style="width: 180px"
               />
@@ -326,7 +326,7 @@
               <el-input
                 v-model="form.mdLoadAttnTel"
                 placeholder="请输入装卸货联系电话"
-                :disabled="disabled"
+                disabled
                 v-input-limit="0"
                 size="mini"
                 style="width: 180px"
@@ -340,7 +340,7 @@
               <el-input
                 v-model="form.unLoadAddr"
                 placeholder="请输入卸箱地点"
-                :disabled="disabled"
+                disabled
                 size="mini"
                 style="width: 180px"
               />
@@ -351,7 +351,7 @@
               <el-input
                 v-model="form.unLoadAddr"
                 placeholder="请输入卸箱地点"
-                :disabled="disabled"
+                disabled
                 size="mini"
                 style="width: 180px"
               />
@@ -366,7 +366,7 @@
                 v-model="form.unLoadDate"
                 type="datetime"
                 placeholder="选择计划卸车时间"
-                :disabled="disabled"
+                disabled
               >
               </el-date-picker>
             </el-form-item>
@@ -376,7 +376,7 @@
               <el-input
                 v-model="form.unLoadAttn"
                 placeholder="请输入卸车联系人"
-                :disabled="disabled"
+                disabled
                 size="mini"
                 style="width: 180px"
               />
@@ -387,7 +387,7 @@
               <el-input
                 v-model="form.unLoadAttnTel"
                 placeholder="请输入卸车联系电话"
-                :disabled="disabled"
+                disabled
                 v-input-limit="0"
                 size="mini"
                 style="width: 180px"
@@ -403,7 +403,7 @@
                 :rows="2"
                 v-model="form.routeDesc"
                 placeholder="请输入线路描述"
-                :disabled="disabled"
+                disabled
                 size="mini"
               />
             </el-form-item>
@@ -417,7 +417,7 @@
                 :rows="2"
                 v-model="form.remarks"
                 placeholder="请输入备注"
-                :disabled="disabled"
+                disabled
                 size="mini"
               />
             </el-form-item>
@@ -452,7 +452,7 @@
                     icon="el-icon-plus"
                     size="mini"
                     @click="addschedulingRow(schedulingList)"
-                    :disabled="disabled"
+                    disabled
                     >添加</el-button
                   >
                 </div>
@@ -463,7 +463,7 @@
                     <el-select
                       v-model="scope.row.cntrId"
                       placeholder="请选择箱型"
-                      :disabled="disabled"
+                      disabled
                     >
                       <el-option
                         v-for="(dict, index) in cntrIdList"
@@ -487,7 +487,7 @@
                       placeholder="请输入车队名称"
                       :clearable="true"
                       filterable
-                      :disabled="disabled"
+                      disabled
                     >
                       <el-option
                         v-for="(dict, index) in companyList"
@@ -503,14 +503,14 @@
                   label="调度安排货量"
                   align="center"
                   prop="cntrQty"
-                  :disabled="disabled"
+                  disabled
                 >
                   <template slot-scope="scope">
                     <el-input
                       v-model="scope.row.cntrQty"
                       placeholder="调度安排货量"
                       v-input-limit="2"
-                      :disabled="disabled"
+                      disabled
                     />
                   </template>
                 </el-table-column>
@@ -532,7 +532,7 @@
                     <el-input
                       v-model="scope.row.remarks"
                       placeholder="备注"
-                      :disabled="disabled"
+                      disabled
                     />
                   </template>
                 </el-table-column>
@@ -562,6 +562,7 @@
                     icon="el-icon-plus"
                     size="mini"
                     @click="addRow2(vehicleList)"
+                    :disabled="disabled"
                     >添加</el-button
                   >
                 </div>
@@ -1176,20 +1177,22 @@
                       v-model="scope.row.attachName"
                       placeholder="附件名称"
                       show-word-limit
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
                 <el-table-column
-                  prop="opuserID "
+                  prop="createBy "
                   header-align="center"
                   align="center"
                   label="上传人"
                 >
                   <template slot-scope="scope">
                     <el-input
-                      v-model="scope.row.opuserID"
+                      v-model="scope.row.createBy"
                       placeholder="上传人"
                       show-word-limit
+                      :disabled="disabled"
                     />
                   </template>
                 </el-table-column>
@@ -1203,7 +1206,7 @@
                     <el-date-picker
                       v-model="scope.row.opdata"
                       type="datetime"
-                      disabled
+                      :disabled="disabled"
                       placeholder="上传时间"
                       format="yyyy-MM-dd HH:mm"
                       value-format="timestamp"
@@ -1351,6 +1354,10 @@ export default {
       type: Array,
       default: [],
     },
+    relevantAttachments: {
+      type: Array,
+      default: [],
+    },
   },
   components: {
     UploadFile,
@@ -1417,7 +1424,6 @@ export default {
       transTypeList: [],
       transPropList: [],
       goodsLossTypeList: [],
-      relevantAttachments: [],
       cntrIdList: [],
       priceTypeList: [],
       userType: null,
@@ -1525,7 +1531,7 @@ export default {
       this.relevantAttachments.push({
         attachUrl: null,
         attachName: null,
-        opuserID: this.username,
+        createBy: this.username,
         opdata: Date.parse(new Date()),
       });
     },
@@ -1630,8 +1636,11 @@ export default {
           this.vehicleList.map((e) => {
             num += parseInt(e.cntrQty);
           });
-          for(let li in this.vehicleList) { 
-            if (this.vehicleList[li].billStatus != 6 && this.vehicleList[li].billStatus != 3) {
+          for (let li in this.vehicleList) {
+            if (
+              this.vehicleList[li].billStatus != 6 &&
+              this.vehicleList[li].billStatus != 3
+            ) {
               return this.msgSuccess("车辆安排存在未提交的数据");
             }
           }
@@ -1746,8 +1755,11 @@ export default {
     },
     //修改
     submitAllowChanges() {
-      this.$emit("fixDisabled", "false");
-      this.msgSuccess("允许修改");
+      // if (this.schedulingList.billStatus > 6) {
+      //   this.$emit("fixDisabled", "false");
+      //   this.msgSuccess("允许修改");
+      // }
+
       // const id = this.form.id;
       // allowChangesFtmsorderbills(id).then((response) => {
       //   if (response == false) {

src/views/fleet/sendcar/index.vue

@@ -373,6 +373,7 @@
       :schedulingList="schedulingList"
       :vehicleList="vehicleList"
       :collapses="collapses"
+      :relevantAttachments="relevantAttachments"
       @changeShow="showAddOrUpdate"
       @fixDisabled="fixDisabled"
       ref="addOrUpdateRef"
@@ -411,6 +412,7 @@ export default {
       showSearch: true,
       // 订单主表格数据
       ftmsorderbillsList: [],
+      relevantAttachments:[],
       // 总条数
       total: 0,
       // 查询参数
@@ -895,6 +897,7 @@ export default {
       this.disabled = false;
       this.disabled2 = false;
       this.collapses = ["1", "2"];
+      this.relevantAttachments=[]
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -915,7 +918,9 @@ export default {
         }
         let arr = [];
         arr.push(response.data.plans);
-        this.disabled = true;
+        if(response.data.plans.billStatus == 60){
+          this.disabled = true;
+        }
         this.title = "查看订单";
         this.form = response.data.tmsorder;
         if (response.data.fees.length) {
@@ -944,6 +949,7 @@ export default {
           });
         }
         this.vehicleList = response.data.cars;
+        this.relevantAttachments=response.data.attachs;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
       });
     },

src/views/index.vue

@@ -6,9 +6,7 @@
           <div slot="content">
             <div class="content-top">
               <div class="content-top-left">
-                <div
-                  style="display: flex; align-self: center; margin-left: 5px"
-                >
+                <div style="display: flex; align-self: center;margin-left: 5px">
                   <div style="align-self: center">
                     <svg
                       t="1616396514864"
@@ -38,12 +36,7 @@
                   </div>
                 </div>
                 <div
-                  style="
-                    font-size: 36px;
-                    align-self: center;
-                    font-weight: 600;
-                    color: #014da1;
-                  "
+                  style="font-size: 36px; align-self: center; font-weight: 600;color:#014da1"
                 >
                   {{ upperLeftCntrs.planQuantity }}
                 </div>
@@ -54,7 +47,7 @@
                     display: flex;
                     align-self: center;
                     min-width: 120px;
-                    margin-left: 5px;
+                    margin-left: 5px
                   "
                 >
                   <div style="align-self: center">
@@ -85,19 +78,14 @@
                   </div>
                 </div>
                 <div
-                  style="
-                    font-size: 36px;
-                    align-self: center;
-                    font-weight: 600;
-                    color: #014da1;
-                  "
+                  style="font-size: 36px; align-self: center; font-weight: 600;color:#014da1"
                 >
                   {{ upperLeftCntrs.surplusQuantity }}
                 </div>
               </div>
             </div>
             <div class="content-bottom">
-              <div style="display: flex; align-self: center; margin-left: 5px">
+              <div style="display: flex; align-self: center;margin-left: 5px">
                 <div style="align-self: center">
                   <svg
                     t="1616402886142"
@@ -131,12 +119,7 @@
                 </div>
               </div>
               <div
-                style="
-                  font-size: 36px;
-                  align-self: center;
-                  font-weight: 600;
-                  color: #014da1;
-                "
+                style="font-size: 36px; align-self: center; font-weight: 600;color:#014da1"
               >
                 {{ fleetData.upperLeftCarQuantity }}
               </div>
@@ -144,12 +127,7 @@
             </div>
             <div class="content-bottom">
               <div
-                style="
-                  display: flex;
-                  align-self: center;
-                  min-width: 120px;
-                  margin-left: 5px;
-                "
+                style="display: flex; align-self:center; min-width: 120px;margin-left: 5px"
               >
                 <div style="align-self: center">
                   <svg
@@ -180,12 +158,7 @@
                 </div>
               </div>
               <div
-                style="
-                  font-size: 36px;
-                  align-self: center;
-                  font-weight: 600;
-                  color: #014da1;
-                "
+                style="font-size: 36px; align-self: center; font-weight: 600;color:#014da1"
               >
                 {{ fleetData.upperLeftOldCarQuantity }}
               </div>
@@ -207,31 +180,29 @@
       </div>
       <div class="home-right">
         <chi-card title="运行车辆" iconName="el-icon-s-order" :More="true">
-          <div slot="content" >
-            <div class="upper-right" v-if="fleetData.upperRight.length > 0">
+          <div slot="content" class="upper-right">
+            <div
+              style="display: flex; padding: 4px 15px; font-size: 14px"
+              v-for="(item, index) in upperRights"
+              :key="index"
+              :style="{
+                backgroundColor: index % 2 == 0 ? '#fafbfd' : '#FFFFFF',
+              }"
+            >
+              <div style="width: 30%">{{ item.mblno }}</div>
+              <div style="width: 20%">{{ item.carregNo }}</div>
+              <div style="width: 15%; color: #67c23a">
+                {{ item.orderStatus | statusType }}
+              </div>
               <div
-                style="display: flex; padding: 4px 15px; font-size: 14px"
-                v-for="(item, index) in fleetData.upperRight.slice(0, 10)"
-                :key="index"
-                :style="{
-                  backgroundColor: index % 2 == 0 ? '#fafbfd' : '#FFFFFF',
-                }"
+                style="
+                  width: 35%;
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                  white-space: nowrap;
+                "
               >
-                <div style="width: 30%">{{ item.mblno }}</div>
-                <div style="width: 20%">{{ item.carregNo }}</div>
-                <div style="width: 15%; color: #67c23a">
-                  {{ item.orderStatus | statusType }}
-                </div>
-                <div
-                  style="
-                    width: 35%;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    white-space: nowrap;
-                  "
-                >
-                  {{ item.corpName }}
-                </div>
+                {{ item.corpName }}
               </div>
             </div>
           </div>
@@ -249,18 +220,14 @@
               <div style="width: 30%" class="single_line">FK221516485645</div>
               <div style="width: 20%" class="single_line">运费运费运费</div>
               <div style="width: 15%" class="single_line">李刚</div>
-              <div style="width: 15%; color: #67c23a" class="single_line">
-                待审批
-              </div>
+              <div style="width: 15%; color: #67c23a" class="single_line">待审批</div>
               <div style="width: 20%" class="single_line">2020/10/10</div>
             </div>
-            <div style="font-size: 14px; display: flex; margin: 4px 15px">
+            <div style="font-size: 14px; display: flex; margin: 4px 15px;">
               <div style="width: 30%" class="single_line">FK221516485645</div>
               <div style="width: 20%" class="single_line">运费运费运费</div>
               <div style="width: 15%" class="single_line">李刚</div>
-              <div style="width: 15%; color: #67c23a" class="single_line">
-                待审批
-              </div>
+              <div style="width: 15%; color: #67c23a" class="single_line">待审批</div>
               <div style="width: 20%" class="single_line">2020/10/10</div>
             </div>
           </div>
@@ -281,13 +248,11 @@
               <div style="width: 15%; color: #67c23a">待审批</div>
               <div style="width: 20%" class="single_line">2020/10/10</div>
             </div>
-            <div style="font-size: 14px; display: flex; margin: 4px 15px">
+            <div style="font-size: 14px; display: flex; margin: 4px 15px;">
               <div style="width: 30%" class="single_line">FK221516485645</div>
               <div style="width: 20%" class="single_line">运费运费运费</div>
               <div style="width: 15%" class="single_line">李刚</div>
-              <div style="width: 15%; color: #67c23a" class="single_line">
-                待审批
-              </div>
+              <div style="width: 15%; color: #67c23a" class="single_line">待审批</div>
               <div style="width: 20%" class="single_line">2020/10/10</div>
             </div>
           </div>
@@ -544,6 +509,7 @@ export default {
       fleetData: "",
       upperLeftCntrs: {},
       sysType: "",
+      upperRights:[]
     };
   },
   filters: {
@@ -581,6 +547,9 @@ export default {
   created() {
     queryHomeInfo().then((response) => {
       this.fleetData = response.data;
+      if(response.data.upperRight.length>0){
+         this.upperRights=response.data.upperRight.slice(0 , 10)
+      }
       this.upperLeftCntrs = response.data.upperLeftCntrs;
     });
     this.getConfigKey("sys.index.systype").then((response) => {
@@ -1178,7 +1147,7 @@ export default {
     padding: 10px 0;
     height: 260px;
   }
-  .upper-right2 {
+   .upper-right2 {
     padding: 10px 0;
     height: 130px;
   }

src/views/system/toConfigure/index.vue

@@ -108,7 +108,7 @@ export default {
       dataForm: {
         pathId: null,
         pathName: null,
-        opUserId: null,
+        createBy: null,
         opUserName: null,
         opDate: null,
         status: 'A',
@@ -142,7 +142,7 @@ export default {
       this.dataForm = {
         pathId: null,
           pathName: null,
-          opUserId: null,
+          createBy: null,
           opUserName: null,
           opDate: null,
           status: 'A',

src/views/track/cabinet/AddOrUpdate.vue

@@ -342,7 +342,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-     
+
         <el-row>
           <el-col :span="6">
             <el-form-item label="起始里程" prop="odometerFrom">
@@ -369,25 +369,25 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="还卸柜时间" prop="unLoadDate">
+            <el-form-item label="接单时间" prop="acceptDate">
               <el-date-picker
                 clearable
                 size="mini"
                 style="width: 180px"
-                v-model="form.unLoadDate"
+                v-model="form.acceptDate"
                 type="date"
                 value-format="yyyy-MM-dd"
-                placeholder="选择还卸柜时间"
+                placeholder="选择接单时间"
                 :disabled="disabled"
               >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="还卸柜备注" prop="unLoadRemarks">
+            <el-form-item label="接单备注" prop="acceptRemarks">
               <el-input
-                v-model="form.unLoadRemarks"
-                placeholder="请输入还卸柜备注"
+                v-model="form.acceptRemarks"
+                placeholder="请输入接单备注"
                 size="mini"
                 style="width: 180px"
                 :disabled="disabled"
@@ -395,35 +395,31 @@
             </el-form-item>
           </el-col>
         </el-row>
-           <el-row>
+        <el-row>
           <el-col :span="6">
-            <el-form-item label="接单时间" prop="acceptDate">
+            <el-form-item label="提箱时间" prop="loadDate">
               <el-date-picker
                 clearable
                 size="mini"
                 style="width: 180px"
-                v-model="form.acceptDate"
+                v-model="form.loadDate"
                 type="date"
                 value-format="yyyy-MM-dd"
-                placeholder="选择接单时间"
-                :disabled="true"
+                placeholder="选择提箱时间"
+                :disabled="disabled"
               >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="提箱时间" prop="loadDate">
-              <el-date-picker
-                clearable
+            <el-form-item label="提箱备注" prop="loadRemarks">
+              <el-input
+                v-model="form.loadRemarks"
+                placeholder="请输入提箱备注"
                 size="mini"
                 style="width: 180px"
-                v-model="form.loadDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择提箱时间"
-                :disabled="true"
-              >
-              </el-date-picker>
+                :disabled="disabled"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -436,11 +432,22 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择装卸货时间"
-                :disabled="true"
+                :disabled="disabled"
               >
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="装卸货备注" prop="mdLoadRemarks">
+              <el-input
+                v-model="form.mdLoadRemarks"
+                placeholder="请输入装卸货备注"
+                size="mini"
+                style="width: 180px"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
           <!-- <el-col :span="6">
             <el-form-item label="还柜时间" prop="unLoadDate">
               <el-date-picker
@@ -456,6 +463,34 @@
               </el-date-picker>
             </el-form-item>
           </el-col> -->
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="还卸柜时间" prop="unLoadDate">
+              <el-date-picker
+                clearable
+                size="mini"
+                style="width: 180px"
+                v-model="form.unLoadDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择还卸柜时间"
+                :disabled="disabled"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="还卸柜备注" prop="unLoadRemarks">
+              <el-input
+                v-model="form.unLoadRemarks"
+                placeholder="请输入还卸柜备注"
+                size="mini"
+                style="width: 180px"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="回单时间" prop="waybillDate">
               <el-date-picker
@@ -466,12 +501,24 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择回单时间"
-                :disabled="true"
+                 :disabled="disabled"
               >
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="回单备注" prop="waybillRemarks">
+              <el-input
+                v-model="form.waybillRemarks"
+                placeholder="请输入回单备注"
+                size="mini"
+                style="width: 180px"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
+
         <el-row>
           <el-col :span="6">
             <el-form-item label="油气费" prop="oilAmt">
@@ -621,7 +668,6 @@
         </el-row>
       </el-form>
       <el-collapse v-model="collapses">
-       
         <el-collapse-item v-if="userType == '00'">
           <template slot="title">
             <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
@@ -978,7 +1024,7 @@
             </el-table>
           </div>
         </el-collapse-item>
-         <el-collapse-item>
+        <el-collapse-item>
           <template slot="title">
             <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
               ><span
@@ -1027,20 +1073,22 @@
                     v-model="scope.row.attachName"
                     placeholder="附件名称"
                     show-word-limit
+                    :disabled="disabled"
                   />
                 </template>
               </el-table-column>
               <el-table-column
-                prop="opuserID "
+                prop="createBy "
                 header-align="center"
                 align="center"
                 label="上传人"
               >
                 <template slot-scope="scope">
                   <el-input
-                    v-model="scope.row.opuserID"
+                    v-model="scope.row.createBy"
                     placeholder="上传人"
                     show-word-limit
+                    :disabled="disabled"
                   />
                 </template>
               </el-table-column>
@@ -1172,6 +1220,10 @@ export default {
       default: [],
     },
     disabled: Boolean,
+    relevantAttachments: {
+      type: Array,
+      default: [],
+    },
   },
   components: {
     UploadFile,
@@ -1220,7 +1272,6 @@ export default {
       transTypeList: [],
       transPropList: [],
       goodsLossTypeList: [],
-      relevantAttachments: [],
       cntrIdList: [],
       priceTypeList: [],
       userType: null,
@@ -1287,7 +1338,7 @@ export default {
       this.relevantAttachments.push({
         attachUrl: null,
         attachName: null,
-        opuserID: this.username,
+        createBy: this.username,
         opdata: Date.parse(new Date()),
       });
     },

src/views/track/cabinet/index.vue

@@ -368,6 +368,7 @@
       :form="form"
       :DList="DList"
       :CList="CList"
+      :relevantAttachments="relevantAttachments"
       :disabled="disabled"
       @changeShow="showAddOrUpdate"
       @fixDisabled="fixDisabled"
@@ -406,6 +407,7 @@ export default {
       showSearch: true,
       // 订单主表格数据
       ftmsorderbillscarsList: [],
+      relevantAttachments:[],
       // 总条数
       total: 0,
       // 查询参数
@@ -1144,6 +1146,7 @@ export default {
       };
       this.disabled = false;
       this.resetForm("form");
+      this.relevantAttachments=[]
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -1176,6 +1179,7 @@ export default {
         }
         this.title = "查看装卸柜";
         this.form = response.data.cars;
+        this.relevantAttachments=response.data.attach;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
       });
     },

src/views/track/goods/AddOrUpdate.vue

@@ -342,7 +342,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        
+
         <el-row>
           <el-col :span="6">
             <el-form-item label="起始里程" prop="odometerFrom">
@@ -474,7 +474,6 @@
         </el-row>
       </el-form>
       <el-collapse v-model="collapses">
-        
         <el-collapse-item v-if="userType == '00'">
           <template slot="title">
             <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
@@ -880,20 +879,22 @@
                     v-model="scope.row.attachName"
                     placeholder="附件名称"
                     show-word-limit
+                     :disabled="disabled"
                   />
                 </template>
               </el-table-column>
               <el-table-column
-                prop="opuserID "
+                prop="createBy "
                 header-align="center"
                 align="center"
                 label="上传人"
               >
                 <template slot-scope="scope">
                   <el-input
-                    v-model="scope.row.opuserID"
+                    v-model="scope.row.createBy"
                     placeholder="上传人"
                     show-word-limit
+                     :disabled="disabled"
                   />
                 </template>
               </el-table-column>
@@ -1025,6 +1026,10 @@ export default {
       default: [],
     },
     disabled: Boolean,
+    relevantAttachments: {
+      type: Array,
+      default: [],
+    },
   },
   components: {
     UploadFile,
@@ -1073,7 +1078,6 @@ export default {
       transTypeList: [],
       transPropList: [],
       goodsLossTypeList: [],
-      relevantAttachments: [],
       cntrIdList: [],
       priceTypeList: [],
       userType: null,
@@ -1140,7 +1144,7 @@ export default {
       this.relevantAttachments.push({
         attachUrl: null,
         attachName: null,
-        opuserID: this.username,
+        createBy: this.username,
         opdata: Date.parse(new Date()),
       });
     },

src/views/track/goods/index.vue

@@ -366,6 +366,7 @@
       :DList="DList"
       :CList="CList"
       :disabled="disabled"
+      :relevantAttachments="relevantAttachments"
       @changeShow="showAddOrUpdate"
       @fixDisabled="fixDisabled"
       ref="addOrUpdateRef"
@@ -403,6 +404,7 @@ export default {
       showSearch: true,
       // 订单主表格数据
       ftmsorderbillscarsList: [],
+      relevantAttachments:[],
       // 总条数
       total: 0,
       // 查询参数
@@ -973,6 +975,7 @@ export default {
       };
       this.disabled = false;
       this.resetForm("form");
+      this.relevantAttachments=[]
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -1005,6 +1008,7 @@ export default {
         }
         this.title = "查看装卸货";
         this.form = response.data.cars;
+        this.relevantAttachments=response.data.attach;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
       });
     },

src/views/track/meetSingle/AddOrUpdate.vue

@@ -342,7 +342,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-       
+
         <el-row>
           <el-col :span="6">
             <el-form-item label="起始里程" prop="odometerFrom">
@@ -395,7 +395,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-         <el-row>
+        <el-row>
           <!-- <el-col :span="6">
             <el-form-item label="接单时间" prop="acceptDate">
               <el-date-picker
@@ -474,7 +474,6 @@
         </el-row>
       </el-form>
       <el-collapse v-model="collapses">
-       
         <el-collapse-item v-if="userType == '00'">
           <template slot="title">
             <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
@@ -831,7 +830,7 @@
             </el-table>
           </div>
         </el-collapse-item>
-         <el-collapse-item>
+        <el-collapse-item>
           <template slot="title">
             <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
               ><span
@@ -880,20 +879,22 @@
                     v-model="scope.row.attachName"
                     placeholder="附件名称"
                     show-word-limit
+                     :disabled="disabled"
                   />
                 </template>
               </el-table-column>
               <el-table-column
-                prop="opuserID "
+                prop="createBy "
                 header-align="center"
                 align="center"
                 label="上传人"
               >
                 <template slot-scope="scope">
                   <el-input
-                    v-model="scope.row.opuserID"
+                    v-model="scope.row.createBy"
                     placeholder="上传人"
                     show-word-limit
+                     :disabled="disabled"
                   />
                 </template>
               </el-table-column>
@@ -1025,6 +1026,10 @@ export default {
       default: [],
     },
     disabled: Boolean,
+    relevantAttachments: {
+      type: Array,
+      default: [],
+    },
   },
   components: {
     UploadFile,
@@ -1073,7 +1078,6 @@ export default {
       transTypeList: [],
       transPropList: [],
       goodsLossTypeList: [],
-      relevantAttachments: [],
       cntrIdList: [],
       priceTypeList: [],
       userType: null,
@@ -1140,7 +1144,7 @@ export default {
       this.relevantAttachments.push({
         attachUrl: null,
         attachName: null,
-        opuserID: this.username,
+        createBy: this.username,
         opdata: Date.parse(new Date()),
       });
     },

src/views/track/meetSingle/index.vue

@@ -367,6 +367,7 @@
       :DList="DList"
       :CList="CList"
       :disabled="disabled"
+      :relevantAttachments="relevantAttachments"
       @changeShow="showAddOrUpdate"
       @fixDisabled="fixDisabled"
       ref="addOrUpdateRef"
@@ -404,6 +405,7 @@ export default {
       showSearch: true,
       // 订单主表格数据
       ftmsorderbillscarsList: [],
+      relevantAttachments:[],
       // 总条数
       total: 0,
       // 查询参数
@@ -1006,6 +1008,7 @@ export default {
         }
         this.title = "查看接单";
         this.form = response.data.cars;
+        this.relevantAttachments=response.data.attach;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
       });
     },

src/views/track/receipt/AddOrUpdate.vue

@@ -342,7 +342,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-     
+
         <el-row>
           <el-col :span="6">
             <el-form-item label="起始里程" prop="odometerFrom">
@@ -395,7 +395,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-           <el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="接单时间" prop="acceptDate">
               <el-date-picker
@@ -474,7 +474,6 @@
         </el-row>
       </el-form>
       <el-collapse v-model="collapses">
-       
         <el-collapse-item v-if="userType == '00'">
           <template slot="title">
             <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
@@ -831,7 +830,7 @@
             </el-table>
           </div>
         </el-collapse-item>
-         <el-collapse-item>
+        <el-collapse-item>
           <template slot="title">
             <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
               ><span
@@ -880,20 +879,22 @@
                     v-model="scope.row.attachName"
                     placeholder="附件名称"
                     show-word-limit
+                     :disabled="disabled"
                   />
                 </template>
               </el-table-column>
               <el-table-column
-                prop="opuserID "
+                prop="createBy "
                 header-align="center"
                 align="center"
                 label="上传人"
               >
                 <template slot-scope="scope">
                   <el-input
-                    v-model="scope.row.opuserID"
+                    v-model="scope.row.createBy"
                     placeholder="上传人"
                     show-word-limit
+                     :disabled="disabled"
                   />
                 </template>
               </el-table-column>
@@ -1025,6 +1026,10 @@ export default {
       default: [],
     },
     disabled: Boolean,
+    relevantAttachments: {
+      type: Array,
+      default: [],
+    },
   },
   components: {
     UploadFile,
@@ -1073,7 +1078,6 @@ export default {
       transTypeList: [],
       transPropList: [],
       goodsLossTypeList: [],
-      relevantAttachments: [],
       cntrIdList: [],
       priceTypeList: [],
       userType: null,
@@ -1140,7 +1144,7 @@ export default {
       this.relevantAttachments.push({
         attachUrl: null,
         attachName: null,
-        opuserID: this.username,
+        createBy: this.username,
         opdata: Date.parse(new Date()),
       });
     },

src/views/track/receipt/index.vue

@@ -369,6 +369,7 @@
       :DList="DList"
       :CList="CList"
       :disabled="disabled"
+      :relevantAttachments="relevantAttachments"
       @changeShow="showAddOrUpdate"
       @fixDisabled="fixDisabled"
       ref="addOrUpdateRef"
@@ -778,6 +779,7 @@ export default {
       transTypeList: [],
       billTypeList: [],
       show: false,
+      relevantAttachments:[]
     };
   },
   // 使用子组件
@@ -976,6 +978,7 @@ export default {
       };
       this.disabled = false;
       this.resetForm("form");
+      this.relevantAttachments=[]
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -1008,6 +1011,7 @@ export default {
         }
         this.title = "查看回单";
         this.form = response.data.cars;
+        this.relevantAttachments=response.data.attach;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
       });
     },

src/views/track/suitcase/AddOrUpdate.vue

@@ -342,7 +342,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        
+
         <el-row>
           <el-col :span="6">
             <el-form-item label="起始里程" prop="odometerFrom">
@@ -830,7 +830,7 @@
             </el-table>
           </div>
         </el-collapse-item>
-          <el-collapse-item>
+        <el-collapse-item>
           <template slot="title">
             <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
               ><span
@@ -879,20 +879,22 @@
                     v-model="scope.row.attachName"
                     placeholder="附件名称"
                     show-word-limit
+                     :disabled="disabled"
                   />
                 </template>
               </el-table-column>
               <el-table-column
-                prop="opuserID "
+                prop="createBy "
                 header-align="center"
                 align="center"
                 label="上传人"
               >
                 <template slot-scope="scope">
                   <el-input
-                    v-model="scope.row.opuserID"
+                    v-model="scope.row.createBy"
                     placeholder="上传人"
                     show-word-limit
+                     :disabled="disabled"
                   />
                 </template>
               </el-table-column>
@@ -1024,6 +1026,10 @@ export default {
       default: [],
     },
     disabled: Boolean,
+    relevantAttachments: {
+      type: Array,
+      default: [],
+    },
   },
   components: {
     UploadFile,
@@ -1072,7 +1078,6 @@ export default {
       transTypeList: [],
       transPropList: [],
       goodsLossTypeList: [],
-      relevantAttachments: [],
       cntrIdList: [],
       priceTypeList: [],
       userType: null,
@@ -1139,7 +1144,7 @@ export default {
       this.relevantAttachments.push({
         attachUrl: null,
         attachName: null,
-        opuserID: this.username,
+        createBy: this.username,
         opdata: Date.parse(new Date()),
       });
     },

src/views/track/suitcase/index.vue

@@ -369,6 +369,7 @@
       :DList="DList"
       :CList="CList"
       :disabled="disabled"
+      :relevantAttachments="relevantAttachments"
       @changeShow="showAddOrUpdate"
       @fixDisabled="fixDisabled"
       ref="addOrUpdateRef"
@@ -396,6 +397,7 @@ export default {
   name: "plans",
   data() {
     return {
+      relevantAttachments:[],
       // 控制新增编辑弹窗的显示与隐藏
       addOrUpdateVisible: false,
       // 非单个禁用
@@ -976,6 +978,7 @@ export default {
       };
       this.disabled = false;
       this.resetForm("form");
+      this.relevantAttachments=[]
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -1008,6 +1011,7 @@ export default {
         }
         this.title = "查看提箱";
         this.form = response.data.cars;
+        this.relevantAttachments=response.data.attach;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
       });
     },