Merge remote-tracking branch 'origin/master'

src/views/iosBasicData/AirtransportExport/bills/assembly/reportformsFrame/PurchaseNotice.vue

@@ -198,6 +198,20 @@
         </el-form-item>
       </el-col>
       <el-col :span="24">
+        <el-form-item label="地址:" prop="corpCnName">
+          <el-input
+            type="textarea"
+            style="width: 100%;"
+            v-model="documentForm.cyAddress"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="地址"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
         <el-form-item label="REMARKS:" prop="corpCnName">
           <el-input
             type="textarea"
@@ -307,7 +321,7 @@ export default {
   },
   created() {
     this.getLazylistfun();
-     this.getWorkDicts("placeofStuffing").then(res => {
+    this.getWorkDicts("placeofStuffing").then(res => {
       this.placeOptions = res.data.data;
     });
   },

src/views/iosBasicData/AirtransportImport/bills/assembly/reportformsFrame/PurchaseNotice.vue

@@ -198,6 +198,20 @@
         </el-form-item>
       </el-col>
       <el-col :span="24">
+        <el-form-item label="地址:" prop="corpCnName">
+          <el-input
+            type="textarea"
+            style="width: 100%;"
+            v-model="documentForm.cyAddress"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="地址"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
         <el-form-item label="REMARKS:" prop="corpCnName">
           <el-input
             type="textarea"
@@ -307,7 +321,7 @@ export default {
   },
   created() {
     this.getLazylistfun();
-     this.getWorkDicts("placeofStuffing").then(res => {
+    this.getWorkDicts("placeofStuffing").then(res => {
       this.placeOptions = res.data.data;
     });
   },

src/views/iosBasicData/OceanFreightImport/bills/assembly/reportformsFrame/PurchaseNotice.vue

@@ -225,6 +225,20 @@
         </el-form-item>
       </el-col>
       <el-col :span="24">
+        <el-form-item label="地址:" prop="corpCnName">
+          <el-input
+            type="textarea"
+            style="width: 100%;"
+            v-model="documentForm.cyAddress"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="地址"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
         <el-form-item label="REMARKS:" prop="corpCnName">
           <el-input
             type="textarea"
@@ -254,7 +268,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-          <el-form-item label="装货地点" prop="corpCnName" label-width="95px">
+        <el-form-item label="装货地点" prop="corpCnName" label-width="95px">
           <el-select v-model="documentForm.placeofStuffing" placeholder="请选择" size="small">
             <el-option v-for="item in placeOptions" :key="item.id" :label="item.dictValue" :value="item.dictValue"> </el-option>
           </el-select>
@@ -334,7 +348,7 @@ export default {
   },
   created() {
     this.getLazylistfun();
-     this.getWorkDicts("placeofStuffing").then(res => {
+    this.getWorkDicts("placeofStuffing").then(res => {
       this.placeOptions = res.data.data;
     });
   },

src/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/PurchaseNotice.vue

@@ -249,6 +249,20 @@
         </el-form-item>
       </el-col>
       <el-col :span="24">
+        <el-form-item label="地址:" prop="corpCnName">
+          <el-input
+            type="textarea"
+            style="width: 100%;"
+            v-model="documentForm.cyAddress"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="地址"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
         <el-form-item label="REMARKS:" prop="corpCnName">
           <el-input
             type="textarea"