修改文字错误

src/views/contractPlacing/index.vue

@@ -59,7 +59,7 @@
           <div class="mainModules">
 <!--            <span>预计装货时间</span>-->
             <!--            <el-input style="width:80%;margin-left:20px;top: 4px" v-model="form.fBsdate"/>-->
-            <el-form-item label="起运港口" prop="fBsdate">
+            <el-form-item label="预计装货时间" prop="fBsdate">
               <el-date-picker
                 v-model="form.fBsdate"
                 style="width:80%;"
@@ -127,12 +127,30 @@
           </div>
           <div class="mainModules">
             <el-form-item label="箱内签收单" prop="fSign">
-              <el-input style="width:80%;" v-model="form.fSign"/>
+<!--              <el-input style="width:80%;" v-model="form.fSign"/>-->
+              <el-select style="width:80%;" placeholder="请选择"
+                         v-model="form.fSign">
+                <el-option
+                  v-for="(dict, index) in cEsign"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </div>
           <div class="mainModules">
             <el-form-item label="订舱人扣货" prop="fDetentioncargo">
-              <el-input style="width:80%;" v-model="form.fDetentioncargo"/>
+<!--              <el-input style="width:80%;" v-model="form.fDetentioncargo"/>-->
+              <el-select style="width:80%;" placeholder="请选择"
+                         v-model="form.fDetentioncargo">
+                <el-option
+                  v-for="(dict, index) in etentioncargo"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </div>
           <div style="width: 70%;">
@@ -154,7 +172,7 @@
                      :disabled="!form.fLoadportid || !form.fDestportid">查看船期
           </el-button>
         </div>
-        <span style="color:red">{{estimaTe.pidName}}</span>
+        <span style="color:red;display: block;margin-bottom: -40px;">{{estimaTe.pidName}}</span>
         <!--        步骤条-->
         <div style="width: 100%;" v-if="!estimaTe">
           <div style="width: 80%;margin: 0 auto;padding-bottom: 10px">
@@ -667,6 +685,7 @@ export default {
       tableData: [],
       container: [],
       form: {},
+      etentioncargo:[],
       estimaTe: '',
       list: {
         fInsuranceamt:0,
@@ -676,7 +695,8 @@ export default {
       whether: false,
       dangerous: [],
       boxStatus: true,
-      fStatus:[]
+      fStatus:[],
+      cEsign:[]
     };
   },
   created() {
@@ -687,6 +707,8 @@ export default {
     this.dictionary('f_packageid');
     this.dictionary('f_ifdanger');
     this.dictionary('f_updateEF');
+    this.dictionary('f_sign');
+    this.dictionary('f_detentioncargo');
     this.handleQuery();
     this.queryGoods();
     this.queryContainer();
@@ -695,6 +717,12 @@ export default {
       this.detailsInquiry(this.$route.query.data);
       this.boxInformation = true;
       this.boxStatus = false;
+    }else if (this.$route.query.res){
+      let data = JSON.parse(this.$route.query.res)
+      this.form.fLoadportid = data.fPortofloadid
+      this.form.fDestportid = data.fDistinationid
+      this.form.fBsdate = data.fEtd
+      this.estimatedTime()
     }
   },
   methods: {
@@ -872,9 +900,14 @@ export default {
               this.dangerous = res.data.data;
               break;
             case 'f_updateEF':
-              console.log(res.data.data);
               this.fStatus = res.data.data;
               break;
+            case 'f_sign':
+              this.cEsign = res.data.data;
+              break;
+            case 'f_detentioncargo':
+              this.etentioncargo = res.data.data;
+              break;
             default:
               break;
           }

src/views/inquiryAndOrder/index.vue

@@ -95,10 +95,8 @@
             v-model="portToPort.fPortofloadid"
             filterable
             remote
-            @change="handleQuery"
             style="width: 100%;"
             class="elSelect"
-            :remote-method="handleQuery"
             placeholder="请输入模糊查找起运港口"
           >
             <el-scrollbar>
@@ -121,7 +119,7 @@
             v-model="portToPort.fDistinationid"
             filterable
             remote
-            @change="handleQuery"
+            @change=""
             style="width: 100%;"
             class="elSelect"
             placeholder="请输入模糊查找目的港口"
@@ -139,12 +137,49 @@
         <!--        <el-input placeholder="请输入目的港口" v-model="portToPort.fDistinationid">-->
         <!--          <template slot="prepend">目的港口</template>-->
         <!--        </el-input>-->
-        <el-input placeholder="请输入货物名称">
-          <template slot="prepend">货物名称</template>
-        </el-input>
-        <el-input placeholder="请输入预计装货时间" v-model="portToPort.fEta">
-          <template slot="prepend">预计装货时间</template>
-        </el-input>
+        <div style="width: 400px;align-items: center;display: flex;margin-top: 10px">
+          <el-button disabled
+                     style="border: 1px solid #DCDFE6;color:#95989d;background-color: #f5f7fa;border-top-right-radius:0;border-bottom-right-radius:0">
+            货物名称
+          </el-button>
+          <!--        <el-input placeholder="请输入货物名称">-->
+<!--          <template slot="prepend">货物名称</template>-->
+          <el-select
+            v-model="portToPort.fGoodsid"
+            filterable
+            remote
+            style="width: 80%;"
+            class="elSelect"
+            placeholder="请输入模糊查找货物名称"
+          >
+            <el-scrollbar>
+              <el-option
+                v-for="(dict, index) in goods"
+                :key="dict.fId"
+                :label="dict.fName"
+                :value="dict.fId"
+              ></el-option>
+            </el-scrollbar>
+          </el-select>
+        </div>
+<!--        </el-input>-->
+<!--        <el-input placeholder="请输入预计装货时间" v-model="portToPort.fEta">-->
+<!--          <template slot="prepend">预计装货时间</template>-->
+<!--        </el-input>-->
+        <div style="width: 400px;align-items: center;display: flex;margin-top: 10px">
+          <el-button disabled
+                     style="border: 1px solid #DCDFE6;color:#95989d;background-color: #f5f7fa;border-top-right-radius:0;border-bottom-right-radius:0">
+            预计装货时间
+          </el-button>
+          <!--        <el-input placeholder="请输入货物名称">-->
+          <el-date-picker
+            v-model="portToPort.fEta"
+            type="date"
+            placeholder="选择日期" style="width: 100%;"
+            value-format="yyyy-MM-dd">
+            <template slot="prepend">预计装货时间</template>
+          </el-date-picker>
+        </div>
         <button class="stealthbutton"></button>
         <button class="stealthbutton"></button>
       </div>
@@ -276,7 +311,9 @@
               </el-table-column>
               <el-table-column
                 label="操作">
-                <el-button type="primary" @click="placeAnOrder">订舱</el-button>
+                <template slot-scope="scope">
+                  <el-button type="primary" @click="placeAnOrder(scope.row)">订舱</el-button>
+                </template>
               </el-table-column>
             </el-table>
           </div>
@@ -303,6 +340,7 @@ export default {
       },
       detailedList: [],
       value1: '',
+      goods:[],
       selection: '1',
       whether: false,
       activeIndex: '1',
@@ -317,7 +355,24 @@ export default {
       tableData: []
     };
   },
+  created() {
+    this.handleQuery()
+    this.queryGoods()
+  },
   methods: {
+    queryGoods() {
+      request({
+        url: '/khwarehouse/warehousebills/getGoodName',
+        method: 'post',
+      })
+        .then(res => {
+          console.log(res);
+          this.goods = res.data.data;
+        })
+        .catch(err => {
+          console.log(err);
+        });
+    },
     handleSelect(key, keyPath) {
       this.whether = false;
       this.activeIndex2 = key;
@@ -356,8 +411,8 @@ export default {
           console.log(err);
         });
     },
-    placeAnOrder(){
-      this.$router.push({ path: '/contractPlacing/index'});
+    placeAnOrder(res){
+      this.$router.push({ path: '/contractPlacing/index',query: { res:JSON.stringify(res) }})
     },
     handleQuery() {
       // this.fMblnoOptions