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

src/views/track/singleCost/AddOrUpdate.vue

@@ -11,22 +11,13 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="客户名称" prop="corpId">
-              <el-select
-                v-model="form.corpId"
-                placeholder="请输入客户名称"
-                :clearable="true"
-                filterable
+              <el-input
+                v-model="form.fCorpIds"
+                placeholder="客户名称"
+                :disabled="true"
                 size="mini"
                 style="width: 180px"
-                :disabled="true"
-              >
-                <el-option
-                  v-for="(dict, index) in fMblnoOptions"
-                  :key="index.fId"
-                  :label="dict.fName"
-                  :value="dict.fId"
-                />
-              </el-select>
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -86,9 +77,9 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="提箱地点" prop="loadAddr">
+            <el-form-item label="提箱地点" prop="tLoadAddr">
               <el-input
-                v-model="form.loadAddr"
+                v-model="form.tLoadAddr"
                 placeholder="请输入提箱地点"
                 :disabled="true"
                 size="mini"
@@ -102,7 +93,7 @@
                 clearable
                 size="mini"
                 style="width: 180px"
-                v-model="form.loadDate"
+                v-model="form.tLoadDate"
                 type="date"
                 :disabled="true"
                 value-format="yyyy-MM-dd"
@@ -114,8 +105,8 @@
           <el-col :span="6">
             <el-form-item label="装货地点" prop="mdLoadAddr">
               <el-input
-                v-model="form.mdLoadAddr"
-                placeholder="请输入装货地点"
+                v-model="form.tMdLoadAddr"
+                placeholder="装货地点"
                 :disabled="true"
                 size="mini"
                 style="width: 180px"
@@ -451,17 +442,16 @@
             icon="el-icon-delete"
             :disabled="scope.row.actId != '1090' ? true : false || disabled"
             @click.native.prevent="deleteRow(scope.$index)"
-          >删除</el-button
-          >
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
     </span>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">提交</el-button>
+      <el-button type="primary" :disabled="disabled" @click="submitForm">提交</el-button>
       <el-button type="success" @click="submitAllowChanges">修改</el-button>
-      <el-button type="info" @click="submitSave">保 存</el-button>
-      <el-button type="warning" @click="submitRetreat">撤 回</el-button>
+      <el-button type="info" :disabled="disabled" @click="submitSave">保 存</el-button>
+      <el-button type="warning" :disabled="disabled" @click="submitRetreat">撤 回</el-button>
       <el-button @click="showDialog = false">取 消</el-button>
     </span>
   </el-dialog>
@@ -554,7 +544,6 @@ export default {
   },
   created() {
     this.getDicts("data_unitfees").then((response) => {
-      console.log(response.data)
       if (response.data){
         this.jFeetunitOptions = response.data;
       }
@@ -563,7 +552,6 @@ export default {
       this.fCNameOptions = response.rows;
     });
     this.getDicts('data_billType').then((response) => {
-      console.log(response.data)
       this.billTypeList = response.data
     })
     this.getDicts('data_transType').then((response) => {
@@ -601,11 +589,9 @@ export default {
       this.feesList.splice(index, 1);
     },
     init() {
-      console.log(this.fname.id)
       this.showDialog = true
       query(this.fname.id).then(data => {
-        console.log(data)
-        this.form = data.data.ftmsorderbills
+        this.form = data.data
         this.feesList = data.data.ftmsorderbillsfees
         for (let item in this.feesList){
           this.feesList[item].fFeeunitid = this.feesList[item].fFeeunitid + ""
@@ -652,7 +638,6 @@ export default {
         fExrate:'',
         remarks:''
       })
-      console.log(this.feesList)
     },
     deleteplansRow(index, rows, row) {
       let arr = this.schedulingList
@@ -682,7 +667,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.feesList)
       this.$refs['form'].validate((valid) => {
         if (valid) {
         }
@@ -703,7 +687,6 @@ export default {
         this.feesList = data.data.ftmsorderbillsfeesList
         for (let item in this.feesList){
           this.feesList[item].fFeeunitid = this.feesList[item].fFeeunitid + ""
-          console.log(this.feesList[item])
         }
         this.$message.success('保存成功');
       })

src/views/track/singleCost/index.vue

@@ -359,162 +359,232 @@ export default {
       showSetting: false,
       drag: false,
       setRowList: [
-   {
+        {
           surface: "1",
-          label: "mblno",
-          name: "提单号",
+          label: "mdLoadDate",
+          name: "装卸日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "2",
-          label: "carregNo",
-          name: "车号",
+          surface: "1",
+          label: "billType",
+          name: "贸易方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "3",
-          label: "orderStatus",
-          name: "订单状态",
+          surface: "1",
+          label: "transType",
+          name: "运输方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "4",
-          label: "acceptDate",
-          name: "接单时间",
+          surface: "1",
+          label: "corpId",
+          name: "托运人",
           checked: 0,
           width: 100,
         },
         {
-          surface: "5",
-          label: "loadDate",
-          name: "提箱时间",
+          surface: "1",
+          label: "ysl",
+          name: "船名",
           checked: 0,
           width: 100,
         },
         {
-          surface: "6",
-          label: "loadAddr",
-          name: "提箱地点",
+          surface: "1",
+          label: "voy",
+          name: "航次",
           checked: 0,
           width: 100,
         },
         {
-          surface: "7",
-          label: "mdLoadDate",
-          name: "装卸货时间",
+          surface: "1",
+          label: "mblno",
+          name: "运单号",
           checked: 0,
-          width: 110,
+          width: 100,
         },
-         {
-          surface: "8",
-          label: "mdLoadAddr",
-          name: "装卸货地点",
+        {
+          surface: "1",
+          label: "cntrQty",
+          name: "柜量",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "9",
-          label: "unLoadDate",
-          name: "还卸柜时间",
+          surface: "1",
+          label: "cntrId",
+          name: "柜型",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "10",
-          label: "unLoadAddr",
-          name: "还卸柜地点",
+          surface: "1",
+          label: "goodsId",
+          name: "品名",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "11",
-          label: "waybillDate",
-          name: "回单时间",
+          surface: "1",
+          label: "cntrWeight",
+          name: "重量",
           checked: 0,
           width: 100,
         },
+        {
+          surface: "1",
+          label: "polId",
+          name: "起运港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "podId",
+          name: "目的港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "loadAddr",
+          name: "提箱场站",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "mdLoadAddr",
+          name: "装货地",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "unLoadAddr",
+          name: "卸货地",
+          checked: 0,
+          width: 100,
+        }
       ],
       getRowList: [
-   {
+        {
           surface: "1",
-          label: "mblno",
-          name: "提单号",
+          label: "mdLoadDate",
+          name: "装卸日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "2",
-          label: "carregNo",
-          name: "车号",
+          surface: "1",
+          label: "billType",
+          name: "贸易方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "3",
-          label: "orderStatus",
-          name: "订单状态",
+          surface: "1",
+          label: "transType",
+          name: "运输方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "4",
-          label: "acceptDate",
-          name: "接单时间",
+          surface: "1",
+          label: "corpId",
+          name: "托运人",
           checked: 0,
           width: 100,
         },
         {
-          surface: "5",
-          label: "loadDate",
-          name: "提箱时间",
+          surface: "1",
+          label: "ysl",
+          name: "船名",
           checked: 0,
           width: 100,
         },
         {
-          surface: "6",
-          label: "loadAddr",
-          name: "提箱地点",
+          surface: "1",
+          label: "voy",
+          name: "航次",
           checked: 0,
           width: 100,
         },
         {
-          surface: "7",
-          label: "mdLoadDate",
-          name: "装卸货时间",
+          surface: "1",
+          label: "mblno",
+          name: "运单号",
           checked: 0,
-          width: 110,
+          width: 100,
         },
-         {
-          surface: "8",
-          label: "mdLoadAddr",
-          name: "装卸货地点",
+        {
+          surface: "1",
+          label: "cntrQty",
+          name: "柜量",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "9",
-          label: "unLoadDate",
-          name: "还卸柜时间",
+          surface: "1",
+          label: "cntrId",
+          name: "柜型",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "10",
-          label: "unLoadAddr",
-          name: "还卸柜地点",
+          surface: "1",
+          label: "goodsId",
+          name: "品名",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "11",
-          label: "waybillDate",
-          name: "回单时间",
+          surface: "1",
+          label: "cntrWeight",
+          name: "重量",
           checked: 0,
           width: 100,
         },
+        {
+          surface: "1",
+          label: "polId",
+          name: "起运港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "podId",
+          name: "目的港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "loadAddr",
+          name: "提箱场站",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "mdLoadAddr",
+          name: "装货地",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "unLoadAddr",
+          name: "卸货地",
+          checked: 0,
+          width: 100,
+        }
       ],
       allCheck: false,
       title: "",