Merge remote-tracking branch 'origin/dev' into dev

src/views/kaihe/domesticTrade/myOrder/index.vue

@@ -712,125 +712,132 @@ export default {
         },
         {
           surface: "9",
+          label: "fAtd",
+          name: "开船日期",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "10",
           label: "fBillstatus",
           name: "状态",
           checked: 0,
           width: 120,
         },
         {
-          surface: "10",
+          surface: "11",
           label: "vslName",
           name: "船名",
           checked: 0,
           width: 120,
         },
         {
-          surface: "11",
+          surface: "12",
           label: "voyNo",
           name: "航次",
           checked: 0,
           width: 120,
         },
         {
-          surface: "12",
+          surface: "13",
           label: "fMblno",
           name: "提单号",
           checked: 0,
           width: 120,
         },
         {
-          surface: "13",
+          surface: "14",
           label: "corpName",
           name: "订舱单位",
           checked: 0,
           width: 120,
         },
         {
-          surface: "14",
+          surface: "15",
           label: "goodsName",
           name: "货名",
           checked: 0,
           width: 120,
         },
         {
-          surface: "15",
+          surface: "16",
           label: "createBy",
           name: "订舱人",
           checked: 0,
           width: 120,
         },
         {
-          surface: "16",
+          surface: "17",
           label: "createTime",
           name: "订舱时间",
           checked: 0,
           width: 120,
         },
         {
-          surface: "17",
+          surface: "18",
           label: "loadportName",
           name: "起运港",
           checked: 0,
           width: 120,
         },
         {
-          surface: "18",
+          surface: "19",
           label: "destportName",
           name: "目的港",
           checked: 0,
           width: 120,
         },
         {
-          surface: "19",
+          surface: "20",
           label: "moneyStatus",
           name: "费用状态",
           checked: 0,
           width: 120,
         },
         {
-          surface: "20",
+          surface: "21",
           label: "fReceivable",
           name: "应收",
           checked: 0,
           width: 120,
         },
         {
-          surface: "21",
+          surface: "22",
           label: "fRecycle",
           name: "实收",
           checked: 0,
           width: 120,
         },
         {
-          surface: "22",
+          surface: "23",
           label: "fDue",
           name: "应付",
           checked: 0,
           width: 120,
         },
         {
-          surface: "23",
+          surface: "24",
           label: "fPay",
           name: "实付",
           checked: 0,
           width: 120,
         },
         {
-          surface: "24",
+          surface: "25",
           label: "fCaregoStatus",
           name: "货物状态",
           checked: 0,
           width: 120,
         },
         {
-          surface: "25",
+          surface: "26",
           label: "fCargoPlanning",
           name: "配船",
           checked: 0,
           width: 120,
         },
         {
-          surface: "26",
+          surface: "27",
           label: "remark",
           name: "备注",
           checked: 0,
@@ -1096,6 +1103,9 @@ export default {
         if (response.rows) {
           response.rows.forEach((e) => {
             e.fServiceitems = e.fServiceitems + "-" + e.fDestportMode;
+            if(e.fAtd){
+              e.fAtd=e.fAtd.slice(0,10)
+            }
           });
         }
         this.corpsList = response.rows;

src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -304,6 +304,16 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
+              <el-form-item label="开船日期" prop="fAtd">
+                <el-input
+                  v-model="estimatedTime.fAtd"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="中转港口" prop="portoftransshipmentName">
                 <el-input
                   v-model="estimatedTime.portoftransshipmentName"