Browse Source

修改bug

qukaidi 3 years ago
parent
commit
2450b9fbc9

+ 22 - 9
src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -58,6 +58,9 @@
                   @getCorpData="getCorpName" corpType="GS"></crop-select>
                 <el-input type="text" v-else-if="item.prop === 'initials'" v-model="form[item.prop]" size="small"
                   autocomplete="off" :disabled="item.disabled" show-word-limit maxlength="1"></el-input>
+                <el-input type="textarea" v-else-if="item.prop === 'remarks'" :rows="2" placeholder="请输入内容"
+                  v-model="form[item.prop]">
+                </el-input>
                 <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off"
                   :disabled="item.disabled"></el-input>
               </el-form-item>
@@ -69,7 +72,17 @@
           <el-row>
             <el-col v-for="(item, index) in contactInformation.column" :key="index" :span="item.span ? item.span : 8">
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                <el-input type="age" v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
+                <el-input type="textarea" v-if="item.prop === 'addr'" :rows="2" placeholder="请输入内容"
+                  v-model="form[item.prop]">
+                </el-input>
+                <el-input type="textarea" v-else-if="item.prop === 'storageAddr'" :rows="2" placeholder="请输入内容"
+                  v-model="form[item.prop]">
+                </el-input>
+                <el-input type="textarea" v-else-if="item.prop === 'subStorageAddr'" :rows="2" placeholder="请输入内容"
+                  v-model="form[item.prop]">
+                </el-input>
+                <el-input v-else type="age" v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
+
               </el-form-item>
             </el-col>
           </el-row>
@@ -843,9 +856,9 @@ export default {
     this.getWorkDicts("credit_rating").then(res => {
       this.creditRatingList = res.data.data;
     });
-    if (this.$route.query.customerName){
+    if (this.$route.query.customerName) {
       this.returnButton = true
-    }else {
+    } else {
       this.returnButton = true
     }
     if (this.detailData.id) {
@@ -871,17 +884,17 @@ export default {
       });
     } else if (this.detailData.treeDeptId) {
       this.$set(this.form, "corpsTypeId", this.detailData.treeDeptId);
-      if (this.$route.query.customerName){
+      if (this.$route.query.customerName) {
         this.$set(this.form, "cname", this.$route.query.customerName);
         this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
-      }else if (this.$route.query) {
+      } else if (this.$route.query) {
         this.$set(this.form, "cname", this.$route.query.corpName);
       }
     } else {
-      if (this.$route.query.customerName){
+      if (this.$route.query.customerName) {
         this.$set(this.form, "cname", this.$route.query.customerName);
         this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
-      }else if (this.$route.query) {
+      } else if (this.$route.query) {
         this.$set(this.form, "cname", this.$route.query.corpName);
       }
     }
@@ -1342,9 +1355,9 @@ export default {
       });
     },
     backToList(value) {
-      if (value == '0'){
+      if (value == '0') {
         this.$emit("goBack");
-      }else {
+      } else {
         this.$emit('goBack', true)
       }
     },

+ 58 - 168
src/views/basicData/customerManagement/companyMaterial/detailsPageEdit.vue

@@ -3,92 +3,40 @@
     <div class="customer-head">
       <div class="customer-back">
         <!--        <i class="back-icon el-icon-arrow-left"></i><i style="font-style:normal">返回管理列表</i>-->
-        <el-button
-          type="danger"
-          style="border: none;background: none;color: red"
-          icon="el-icon-arrow-left"
-          @click="backToList"
-          >返回列表
+        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+          @click="backToList">返回列表
         </el-button>
       </div>
       <div class="add-customer-btn">
-        <el-button type="primary" @click="openFlow" size="small"
-          >审 核
+        <el-button type="primary" @click="openFlow" size="small">审 核
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="disabled"
-          @click="editCustomer"
-          size="small"
-          >{{ form.id ? "确认修改" : "确认新增" }}
+        <el-button type="primary" :disabled="disabled" @click="editCustomer" size="small">{{ form.id ? "确认修改" : "确认新增"
+        }}
         </el-button>
       </div>
     </div>
     <div class="customer-main">
-      <el-form
-        :model="form"
-        ref="form"
-        label-width="100px"
-        class="demo-ruleForm"
-      >
+      <el-form :model="form" ref="form" label-width="100px" class="demo-ruleForm">
         <containerTitle title="基础资料"></containerTitle>
         <basic-container>
           <el-row>
-            <el-col
-              v-for="(item, index) in basicData.column"
-              :key="index"
-              :span="item.span ? item.span : 8"
-            >
-              <el-form-item
-                :label="item.label"
-                :prop="item.prop"
-                :rules="item.rules"
-              >
-                <avue-input-tree
-                  v-if="item.prop === 'corpsTypeId'"
-                  leaf-only
-                  multiple
-                  style="width: 100%;"
-                  size="small"
-                  :props="{ label: 'title' }"
-                  v-model="form[item.prop]"
-                  placeholder=" "
-                  type="tree"
-                  :dic="dic"
-                ></avue-input-tree>
-                <el-cascader
-                  v-else-if="item.prop === 'belongtoarea'"
-                  v-model="form[item.prop]"
-                  collapse-tags
-                  :options="dicArea"
-                  :props="props"
-                  size="small"
-                  style="width: 100%;"
-                  :show-all-levels="false"
-                ></el-cascader>
-                <el-select
-                  v-else-if="item.prop === 'adminProfiles'"
-                  size="small"
-                  style="width: 100%;"
-                  v-model="form[item.prop]"
-                  multiple
-                  placeholder=""
-                >
-                  <el-option
-                    v-for="item in userList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  >
+            <el-col v-for="(item, index) in basicData.column" :key="index" :span="item.span ? item.span : 8">
+              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+                <avue-input-tree v-if="item.prop === 'corpsTypeId'" leaf-only multiple style="width: 100%;" size="small"
+                  :props="{ label: 'title' }" v-model="form[item.prop]" placeholder=" " type="tree" :dic="dic">
+                </avue-input-tree>
+                <el-cascader v-else-if="item.prop === 'belongtoarea'" v-model="form[item.prop]" collapse-tags
+                  :options="dicArea" :props="props" size="small" style="width: 100%;" :show-all-levels="false">
+                </el-cascader>
+                <el-select v-else-if="item.prop === 'adminProfiles'" size="small" style="width: 100%;"
+                  v-model="form[item.prop]" multiple placeholder="">
+                  <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id">
                   </el-option>
                 </el-select>
-                <el-input
-                  type="age"
-                  v-else
-                  v-model="form[item.prop]"
-                  size="small"
-                  autocomplete="off"
-                ></el-input>
+                <el-input type="textarea" v-else-if="item.prop === 'remarks'" :rows="2" placeholder="请输入内容"
+                  v-model="form[item.prop]">
+                </el-input>
+                <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -96,22 +44,18 @@
         <containerTitle title="联系方式"></containerTitle>
         <basic-container>
           <el-row>
-            <el-col
-              v-for="(item, index) in contactInformation.column"
-              :key="index"
-              :span="item.span ? item.span : 8"
-            >
-              <el-form-item
-                :label="item.label"
-                :prop="item.prop"
-                :rules="item.rules"
-              >
-                <el-input
-                  type="age"
-                  v-model="form[item.prop]"
-                  size="small"
-                  autocomplete="off"
-                ></el-input>
+            <el-col v-for="(item, index) in contactInformation.column" :key="index" :span="item.span ? item.span : 8">
+              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+                <el-input type="textarea" v-if="item.prop === 'addr'" :rows="2" placeholder="请输入内容"
+                  v-model="form[item.prop]">
+                </el-input>
+                <el-input type="textarea" v-else-if="item.prop === 'storageAddr'" :rows="2" placeholder="请输入内容"
+                  v-model="form[item.prop]">
+                </el-input>
+                <el-input type="textarea" v-else-if="item.prop === 'subStorageAddr'" :rows="2" placeholder="请输入内容"
+                  v-model="form[item.prop]">
+                </el-input>
+                <el-input v-else type="age" v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -119,64 +63,26 @@
         <containerTitle title="财务资料"></containerTitle>
         <basic-container>
           <el-row>
-            <el-col
-              v-for="(item, index) in financialInformation.column"
-              :key="index"
-              :span="item.span ? item.span : 8"
-            >
-              <el-form-item
-                :label="item.label"
-                :prop="item.prop"
-                :rules="item.rules"
-              >
-                <el-switch
-                  v-if="item.prop === 'creditstatus'"
-                  v-model="form[item.prop]"
-                  active-value="0"
-                  inactive-value="1"
-                  active-text="开启"
-                  inactive-text="关闭"
-                >
+            <el-col v-for="(item, index) in financialInformation.column" :key="index" :span="item.span ? item.span : 8">
+              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+                <el-switch v-if="item.prop === 'creditstatus'" v-model="form[item.prop]" active-value="0"
+                  inactive-value="1" active-text="开启" inactive-text="关闭">
                 </el-switch>
-                <el-select
-                  v-else-if="item.prop === 'paymentType'"
-                  v-model="form[item.prop]"
-                  clearable
-                  filterable
-                  size="small"
-                  style="width: 100%;"
-                >
-                  <el-option
-                    v-for="(item, index) in paymentOption"
-                    :key="index"
-                    :label="item.dictValue"
-                    :value="item.dictValue"
-                  ></el-option>
+                <el-select v-else-if="item.prop === 'paymentType'" v-model="form[item.prop]" clearable filterable
+                  size="small" style="width: 100%;">
+                  <el-option v-for="(item, index) in paymentOption" :key="index" :label="item.dictValue"
+                    :value="item.dictValue"></el-option>
                 </el-select>
-                <el-input
-                  v-else
-                  type="age"
-                  v-model="form[item.prop]"
-                  size="small"
-                  autocomplete="off"
-                ></el-input>
+                <el-input v-else type="age" v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
         </basic-container>
         <containerTitle title="客户联系人"></containerTitle>
         <basic-container>
-          <avue-crud
-            ref="crud"
-            :option="customerContact"
-            v-model="contactsForm"
-            :data="contactsData"
-            @saveColumn="saveColumn"
-            @resetColumn="resetColumn"
-            @row-save="rowSave"
-            @row-update="rowUpdate"
-            @row-del="rowDel"
-          ></avue-crud>
+          <avue-crud ref="crud" :option="customerContact" v-model="contactsForm" :data="contactsData"
+            @saveColumn="saveColumn" @resetColumn="resetColumn" @row-save="rowSave" @row-update="rowUpdate"
+            @row-del="rowDel"></avue-crud>
         </basic-container>
         <!-- <containerTitle title="客户优势项目"></containerTitle>
         <basic-container style="margin-bottom: 10px">
@@ -191,31 +97,15 @@
         </basic-container> -->
         <containerTitle title="客户开户行"></containerTitle>
         <basic-container>
-          <avue-crud
-            ref="crud2"
-            :option="bankOfDeposit"
-            v-model="bankOfDepositForm"
-            :data="bankOfDepositData"
-            @saveColumn="saveColumn2"
-            @resetColumn="resetColumn2"
-            @row-save="rowSaveBankOfDeposit"
-            @row-update="rowUpdateBankOfDeposit"
-            @row-del="rowDelBankOfDeposit"
-          ></avue-crud>
+          <avue-crud ref="crud2" :option="bankOfDeposit" v-model="bankOfDepositForm" :data="bankOfDepositData"
+            @saveColumn="saveColumn2" @resetColumn="resetColumn2" @row-save="rowSaveBankOfDeposit"
+            @row-update="rowUpdateBankOfDeposit" @row-del="rowDelBankOfDeposit"></avue-crud>
         </basic-container>
         <containerTitle title="收发货地址"></containerTitle>
         <basic-container>
-          <avue-crud
-            ref="crud3"
-            :option="addressOption"
-            v-model="addressForm"
-            :data="addressData"
-            @saveColumn="saveColumn3"
-            @resetColumn="resetColumn3"
-            @row-save="rowSaveAddress"
-            @row-update="rowUpdateAddress"
-            @row-del="rowDelAddress"
-          ></avue-crud>
+          <avue-crud ref="crud3" :option="addressOption" v-model="addressForm" :data="addressData"
+            @saveColumn="saveColumn3" @resetColumn="resetColumn3" @row-save="rowSaveAddress"
+            @row-update="rowUpdateAddress" @row-del="rowDelAddress"></avue-crud>
         </basic-container>
       </el-form>
     </div>
@@ -541,7 +431,7 @@ export default {
             mock: {
               type: "county"
             }
-          },{
+          }, {
             label: "首字母",
             prop: "initials",
             span: 8
@@ -612,17 +502,17 @@ export default {
       });
     } else if (this.detailData.treeDeptId) {
       this.$set(this.form, "corpsTypeId", this.detailData.treeDeptId);
-      if (this.$route.query.customerName){
+      if (this.$route.query.customerName) {
         this.$set(this.form, "cname", this.$route.query.customerName);
         this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
-      }else if (this.$route.query) {
+      } else if (this.$route.query) {
         this.$set(this.form, "cname", this.$route.query.corpName);
       }
     } else {
-      if (this.$route.query.customerName){
+      if (this.$route.query.customerName) {
         this.$set(this.form, "cname", this.$route.query.customerName);
         this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
-      }else if (this.$route.query) {
+      } else if (this.$route.query) {
         this.$set(this.form, "cname", this.$route.query.corpName);
       }
     }
@@ -786,9 +676,9 @@ export default {
       });
     },
     backToList(value) {
-      if (value == '0'){
+      if (value == '0') {
         this.$emit("goBack");
-      }else {
+      } else {
         this.$emit('goBack', true)
       }
     },

+ 64 - 186
src/views/basicData/customerManagement/supplierMaterial/detailsPageEdit.vue

@@ -3,112 +3,48 @@
     <div class="customer-head">
       <div class="customer-back">
         <!--        <i class="back-icon el-icon-arrow-left"></i><i style="font-style:normal">返回管理列表</i>-->
-        <el-button
-          type="danger"
-          style="border: none;background: none;color: red"
-          icon="el-icon-arrow-left"
-          @click="backToList"
-          >返回列表
+        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+          @click="backToList">返回列表
         </el-button>
       </div>
       <div class="add-customer-btn">
-        <el-button type="primary" @click="openFlow" size="small"
-          >审 核
+        <el-button type="primary" @click="openFlow" size="small">审 核
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="disabled"
-          @click="editCustomer"
-          size="small"
-          >{{ form.id ? "确认修改" : "确认新增" }}
+        <el-button type="primary" :disabled="disabled" @click="editCustomer" size="small">{{ form.id ? "确认修改" : "确认新增"
+        }}
         </el-button>
       </div>
     </div>
     <div class="customer-main">
-      <el-form
-        :model="form"
-        ref="form"
-        label-width="100px"
-        class="demo-ruleForm"
-      >
+      <el-form :model="form" ref="form" label-width="100px" class="demo-ruleForm">
         <containerTitle title="基础资料"></containerTitle>
         <basic-container>
           <el-row>
-            <el-col
-              v-for="(item, index) in basicData.column"
-              :key="index"
-              :span="item.span ? item.span : 8"
-            >
-              <el-form-item
-                :label="item.label"
-                :prop="item.prop"
-                :rules="item.rules"
-              >
-                <avue-input-tree
-                  v-if="item.prop === 'corpsTypeId'"
-                  leaf-only
-                  multiple
-                  style="width: 100%;"
-                  size="small"
-                  :props="{ label: 'title' }"
-                  v-model="form[item.prop]"
-                  placeholder=" "
-                  type="tree"
-                  :dic="dic"
-                ></avue-input-tree>
-                <el-cascader
-                  v-else-if="item.prop === 'belongtoarea'"
-                  v-model="form[item.prop]"
-                  collapse-tags
-                  :options="dicArea"
-                  :props="props"
-                  size="small"
-                  style="width: 100%;"
-                  :show-all-levels="false"
-                ></el-cascader>
-                <el-select
-                  v-else-if="item.prop === 'adminProfiles'"
-                  size="small"
-                  style="width: 100%;"
-                  v-model="form[item.prop]"
-                  multiple
-                  placeholder=""
-                >
-                  <el-option
-                    v-for="item in userList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  >
+            <el-col v-for="(item, index) in basicData.column" :key="index" :span="item.span ? item.span : 8">
+              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+                <avue-input-tree v-if="item.prop === 'corpsTypeId'" leaf-only multiple style="width: 100%;" size="small"
+                  :props="{ label: 'title' }" v-model="form[item.prop]" placeholder=" " type="tree" :dic="dic">
+                </avue-input-tree>
+                <el-cascader v-else-if="item.prop === 'belongtoarea'" v-model="form[item.prop]" collapse-tags
+                  :options="dicArea" :props="props" size="small" style="width: 100%;" :show-all-levels="false">
+                </el-cascader>
+                <el-select v-else-if="item.prop === 'adminProfiles'" size="small" style="width: 100%;"
+                  v-model="form[item.prop]" multiple placeholder="">
+                  <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id">
                   </el-option>
                 </el-select>
-                <el-select
-                  v-else-if="item.prop === 'creditRating'"
-                  size="small"
-                  style="width: 100%;"
-                  v-model="form[item.prop]"
-                  placeholder=""
-                >
-                  <el-option
-                    v-for="item in creditRatingList"
-                    :key="item.id"
-                    :label="item.dictValue"
-                    :value="item.dictValue"
-                  >
+                <el-select v-else-if="item.prop === 'creditRating'" size="small" style="width: 100%;"
+                  v-model="form[item.prop]" placeholder="">
+                  <el-option v-for="item in creditRatingList" :key="item.id" :label="item.dictValue"
+                    :value="item.dictValue">
                   </el-option>
                 </el-select>
-                <crop-select
-                  v-else-if="item.prop === 'belongtocompany'"
-                  v-model="form[item.prop]"
-                  corpType="GS"
-                ></crop-select>
-                <el-input
-                  type="age"
-                  v-else
-                  v-model="form[item.prop]"
-                  size="small"
-                  autocomplete="off"
-                ></el-input>
+                <crop-select v-else-if="item.prop === 'belongtocompany'" v-model="form[item.prop]" corpType="GS">
+                </crop-select>
+                <el-input type="textarea" v-else-if="item.prop === 'remarks'" :rows="2" placeholder="请输入内容"
+                  v-model="form[item.prop]">
+                </el-input>
+                <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -116,22 +52,18 @@
         <containerTitle title="联系方式"></containerTitle>
         <basic-container>
           <el-row>
-            <el-col
-              v-for="(item, index) in contactInformation.column"
-              :key="index"
-              :span="item.span ? item.span : 8"
-            >
-              <el-form-item
-                :label="item.label"
-                :prop="item.prop"
-                :rules="item.rules"
-              >
-                <el-input
-                  type="age"
-                  v-model="form[item.prop]"
-                  size="small"
-                  autocomplete="off"
-                ></el-input>
+            <el-col v-for="(item, index) in contactInformation.column" :key="index" :span="item.span ? item.span : 8">
+              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+                <el-input type="textarea" v-if="item.prop === 'addr'" :rows="2" placeholder="请输入内容"
+                  v-model="form[item.prop]">
+                </el-input>
+                <el-input type="textarea" v-else-if="item.prop === 'storageAddr'" :rows="2" placeholder="请输入内容"
+                  v-model="form[item.prop]">
+                </el-input>
+                <el-input type="textarea" v-else-if="item.prop === 'subStorageAddr'" :rows="2" placeholder="请输入内容"
+                  v-model="form[item.prop]">
+                </el-input>
+                <el-input v-else type="age" v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -139,64 +71,26 @@
         <containerTitle title="财务资料"></containerTitle>
         <basic-container>
           <el-row>
-            <el-col
-              v-for="(item, index) in financialInformation.column"
-              :key="index"
-              :span="item.span ? item.span : 8"
-            >
-              <el-form-item
-                :label="item.label"
-                :prop="item.prop"
-                :rules="item.rules"
-              >
-                <el-switch
-                  v-if="item.prop === 'creditstatus'"
-                  v-model="form[item.prop]"
-                  active-value="0"
-                  inactive-value="1"
-                  active-text="开启"
-                  inactive-text="关闭"
-                >
+            <el-col v-for="(item, index) in financialInformation.column" :key="index" :span="item.span ? item.span : 8">
+              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+                <el-switch v-if="item.prop === 'creditstatus'" v-model="form[item.prop]" active-value="0"
+                  inactive-value="1" active-text="开启" inactive-text="关闭">
                 </el-switch>
-                <el-select
-                  v-else-if="item.prop === 'paymentType'"
-                  v-model="form[item.prop]"
-                  clearable
-                  filterable
-                  size="small"
-                  style="width: 100%;"
-                >
-                  <el-option
-                    v-for="(item, index) in paymentOption"
-                    :key="index"
-                    :label="item.dictValue"
-                    :value="item.dictValue"
-                  ></el-option>
+                <el-select v-else-if="item.prop === 'paymentType'" v-model="form[item.prop]" clearable filterable
+                  size="small" style="width: 100%;">
+                  <el-option v-for="(item, index) in paymentOption" :key="index" :label="item.dictValue"
+                    :value="item.dictValue"></el-option>
                 </el-select>
-                <el-input
-                  v-else
-                  type="age"
-                  v-model="form[item.prop]"
-                  size="small"
-                  autocomplete="off"
-                ></el-input>
+                <el-input v-else type="age" v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
         </basic-container>
         <containerTitle title="客户联系人"></containerTitle>
         <basic-container>
-          <avue-crud
-            ref="crud"
-            :option="customerContact"
-            v-model="contactsForm"
-            :data="contactsData"
-            @saveColumn="saveColumn"
-            @resetColumn="resetColumn"
-            @row-save="rowSave"
-            @row-update="rowUpdate"
-            @row-del="rowDel"
-          ></avue-crud>
+          <avue-crud ref="crud" :option="customerContact" v-model="contactsForm" :data="contactsData"
+            @saveColumn="saveColumn" @resetColumn="resetColumn" @row-save="rowSave" @row-update="rowUpdate"
+            @row-del="rowDel"></avue-crud>
         </basic-container>
         <!-- <containerTitle title="客户优势项目"></containerTitle>
         <basic-container style="margin-bottom: 10px">
@@ -211,31 +105,15 @@
         </basic-container> -->
         <containerTitle title="客户开户行"></containerTitle>
         <basic-container>
-          <avue-crud
-            ref="crud2"
-            :option="bankOfDeposit"
-            v-model="bankOfDepositForm"
-            :data="bankOfDepositData"
-            @saveColumn="saveColumn2"
-            @resetColumn="resetColumn2"
-            @row-save="rowSaveBankOfDeposit"
-            @row-update="rowUpdateBankOfDeposit"
-            @row-del="rowDelBankOfDeposit"
-          ></avue-crud>
+          <avue-crud ref="crud2" :option="bankOfDeposit" v-model="bankOfDepositForm" :data="bankOfDepositData"
+            @saveColumn="saveColumn2" @resetColumn="resetColumn2" @row-save="rowSaveBankOfDeposit"
+            @row-update="rowUpdateBankOfDeposit" @row-del="rowDelBankOfDeposit"></avue-crud>
         </basic-container>
         <containerTitle title="收发货地址"></containerTitle>
         <basic-container>
-          <avue-crud
-            ref="crud3"
-            :option="addressOption"
-            v-model="addressForm"
-            :data="addressData"
-            @saveColumn="saveColumn3"
-            @resetColumn="resetColumn3"
-            @row-save="rowSaveAddress"
-            @row-update="rowUpdateAddress"
-            @row-del="rowDelAddress"
-          ></avue-crud>
+          <avue-crud ref="crud3" :option="addressOption" v-model="addressForm" :data="addressData"
+            @saveColumn="saveColumn3" @resetColumn="resetColumn3" @row-save="rowSaveAddress"
+            @row-update="rowUpdateAddress" @row-del="rowDelAddress"></avue-crud>
         </basic-container>
       </el-form>
     </div>
@@ -578,7 +456,7 @@ export default {
             label: "信用等级",
             prop: "creditRating",
             span: 8
-          },{
+          }, {
             label: "首字母",
             prop: "initials",
             span: 8
@@ -655,17 +533,17 @@ export default {
       });
     } else if (this.detailData.treeDeptId) {
       this.$set(this.form, "corpsTypeId", this.detailData.treeDeptId);
-      if (this.$route.query.customerName){
+      if (this.$route.query.customerName) {
         this.$set(this.form, "cname", this.$route.query.customerName);
         this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
-      }else if (this.$route.query) {
+      } else if (this.$route.query) {
         this.$set(this.form, "cname", this.$route.query.corpName);
       }
     } else {
-      if (this.$route.query.customerName){
+      if (this.$route.query.customerName) {
         this.$set(this.form, "cname", this.$route.query.customerName);
         this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
-      }else if (this.$route.query) {
+      } else if (this.$route.query) {
         this.$set(this.form, "cname", this.$route.query.corpName);
       }
     }
@@ -830,9 +708,9 @@ export default {
       });
     },
     backToList(value) {
-      if (value == '0'){
+      if (value == '0') {
         this.$emit("goBack");
-      }else {
+      } else {
         this.$emit('goBack', true)
       }
     },

+ 1 - 1
src/views/exportTrade/customerInquiry/config/mainList.json

@@ -1,6 +1,6 @@
 {
   "searchShow": true,
-  "searchMenuSpan": 8,
+  "searchMenuSpan": 24,
   "border": true,
   "index": true,
   "viewBtn": false,

+ 81 - 83
src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -23,7 +23,7 @@
       <trade-card title="基础信息">
         <avue-form ref="form" class="trading-form" v-model="form" :option="option">
           <template slot="portOfLoad">
-            <port-info v-model="form.portOfLoad" :disabled="detailData.status == 1" /> 
+            <port-info v-model="form.portOfLoad" :disabled="detailData.status == 1" />
           </template>
           <template slot="portOfDestination">
             <port-info v-model="form.portOfDestination" :disabled="detailData.status == 1" />
@@ -360,33 +360,80 @@ export default {
                 trigger: "blur"
               }
             ],
-            span: 8,
+            span: 10,
             slot: true,
           },
           {
-            label: "联系人",
-            prop: "corpAttn",
-            span: 8
+            label: "公司主体",
+            prop: "belongToCorpId",
+            span: 6,
+            offset: 2,
           },
           {
-            label: "电话",
-            prop: "corpTel",
-            span: 8,
+            label: "系统号",
+            prop: "sysNo",
+            span: 6,
+            disabled: true
           },
           {
             label: "详情信息",
             prop: "clientMessage",
             type: "textarea",
             minRows: 2,
-            span: 12,
-            row: true
+            span: 10
           },
           {
-            label: "公司主体",
-            prop: "belongToCorpId",
+            label: "报价日期",
+            prop: "businesDate",
+            span: 6,
+            offset: 2,
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ]
+          },
+          {
+            label: "报价单号",
+            prop: "orderNo",
             span: 6
           },
           {
+            label: "联系人",
+            prop: "corpAttn",
+            span: 5
+          },
+          {
+            label: "电话",
+            prop: "corpTel",
+            span: 5,
+          },
+          {
+            label: "有效日期",
+            prop: "dateValidity",
+            span: 6,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd 00:00:00",
+            offset: 2,
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ]
+          },
+          {
+            label: "日期说明",
+            prop: "dateDesc",
+            type: "textarea",
+            minRows: 1,
+            span: 6,
+          },
+          {
             label: "起运港",
             prop: "portOfLoad",
             span: 6,
@@ -433,26 +480,7 @@ export default {
             props: {
               label: "dictValue",
               value: "dictValue"
-            },
-            row: true
-          },
-          {
-            label: "价格条款",
-            prop: "priceTerms",
-            span: 6
-            // type: "select",
-            // dicData:[],
-            // props: {
-            //   label: "dictValue",
-            //   value: "dictValue"
-            // }
-          },
-          {
-            label: "条款说明",
-            prop: "priceTermsDescription",
-            type: "textarea",
-            minRows: 1,
-            span: 12,
+            }
           },
           {
             label: "订单状态",
@@ -466,37 +494,27 @@ export default {
             }
           },
           {
-            label: "收款方式",
-            prop: "paymentType",
+            label: "价格条款",
+            prop: "priceTerms",
             span: 6
             // type: "select",
-            // dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_term",
+            // dicData:[],
             // props: {
             //   label: "dictValue",
             //   value: "dictValue"
             // }
           },
           {
-            label: "款说明",
-            prop: "paymentTypeDescription",
+            label: "款说明",
+            prop: "priceTermsDescription",
             type: "textarea",
             minRows: 1,
             span: 12,
           },
           {
-            label: "系统号",
-            prop: "sysNo",
-            span: 6,
-            disabled: true
-          },
-
-          {
-            label: "报价日期",
-            prop: "businesDate",
+            label: "币别",
+            prop: "currency",
             span: 6,
-            // type: "date",
-            // format: "yyyy-MM-dd",
-            // valueFormat: "yyyy-MM-dd 00:00:00",
             rules: [
               {
                 required: true,
@@ -506,44 +524,27 @@ export default {
             ]
           },
           {
-            label: "有效日期",
-            prop: "dateValidity",
-            span: 6,
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
-            rules: [
-              {
-                required: true,
-                message: "",
-                trigger: "blur"
-              }
-            ]
+            label: "收款方式",
+            prop: "paymentType",
+            span: 6
+            // type: "select",
+            // dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_term",
+            // props: {
+            //   label: "dictValue",
+            //   value: "dictValue"
+            // }
           },
           {
-            label: "日期说明",
-            prop: "dateDesc",
+            label: "收款说明",
+            prop: "paymentTypeDescription",
             type: "textarea",
             minRows: 1,
-            span: 6,
-          },
-          {
-            label: "币别",
-            prop: "currency",
-            span: 6,
-            rules: [
-              {
-                required: true,
-                message: "",
-                trigger: "blur"
-              }
-            ]
+            span: 12,
           },
           {
             label: "汇率",
             prop: "exchangeRate",
             span: 6,
-
             rules: [
               {
                 required: true,
@@ -572,11 +573,7 @@ export default {
             row: true,
             disabled: true
           },
-          {
-            label: "报价单号",
-            prop: "orderNo",
-            span: 6
-          },
+
           {
             label: "箱型",
             prop: "boxPile",
@@ -590,6 +587,7 @@ export default {
           {
             label: "起订量",
             prop: "minOrder",
+            row: true,
             span: 6
           },
           {

+ 81 - 90
src/views/exportTrade/salesContract/detailsPage.vue

@@ -427,35 +427,70 @@ export default {
                 trigger: "blur"
               }
             ],
-            span: 8,
+            span: 10,
             slot: true
           },
-
           {
-            label: "联系人",
-            prop: "corpAttn",
-            span: 8
+            label: "公司主体",
+            prop: "belongToCorpId",
+            offset: 2,
+            span: 6
           },
           {
-            label: "电话",
-            prop: "corpTel",
-            span: 8
+            label: "系统号",
+            prop: "sysNo",
+            span: 6,
+            disabled: true
           },
           {
             label: "详情信息",
             prop: "clientMessage",
             type: "textarea",
             minRows: 2,
-            span: 12,
-            row: true
-
+            span: 10
           },
           {
-            label: "公司主体",
-            prop: "belongToCorpId",
+            label: "预交日期",
+            prop: "plannedDeliveryDate",
+            span: 6,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd 00:00:00",
+            offset: 2,
+          },
+          {
+            label: "销售订单号",
+            prop: "orderNo",
             span: 6
           },
           {
+            label: "联系人",
+            prop: "corpAttn",
+            span: 5
+          },
+          {
+            label: "电话",
+            prop: "corpTel",
+            span: 5
+          },
+          {
+            label: "有效日期",
+            prop: "dateValidity",
+            span: 6,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd 00:00:00",
+            offset: 2
+          },
+          {
+            label: "日期说明",
+            prop: "dateDesc",
+            type: "textarea",
+            minRows: 1,
+            span: 6,
+          },
+
+          {
             label: "起运港",
             prop: "portOfLoad",
             span: 6,
@@ -504,17 +539,21 @@ export default {
               value: "dictValue"
             }
           },
-
+          {
+            label: "订单状态",
+            prop: "orderStatus",
+            span: 6,
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=order_status",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            }
+          },
           {
             label: "价格条款",
             prop: "priceTerms",
             span: 6
-            // type: "select",
-            // dicUrl: "/api/blade-system/dict-biz/dictionary?code=pricing_terms",
-            // props: {
-            //   label: "dictValue",
-            //   value: "dictValue"
-            // }
           },
           {
             label: "条款说明",
@@ -524,10 +563,16 @@ export default {
             span: 12,
           },
           {
-            label: "系统号",
-            prop: "sysNo",
+            label: "币别",
+            prop: "currency",
             span: 6,
-            disabled: true
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ]
           },
           {
             label: "收款方式",
@@ -548,72 +593,6 @@ export default {
             span: 12,
           },
           {
-            label: "订单状态",
-            prop: "orderStatus",
-            span: 6,
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=order_status",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            }
-          },
-          {
-            label: "订单日期",
-            prop: "businesDate",
-            span: 6,
-            // type: "date",
-            // format: "yyyy-MM-dd",
-            // valueFormat: "yyyy-MM-dd 00:00:00",
-            rules: [
-              {
-                required: true,
-                message: "",
-                trigger: "blur"
-              }
-            ]
-          },
-          {
-            label: "预交日期",
-            prop: "plannedDeliveryDate",
-            span: 6,
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00"
-          },
-          {
-            label: "日期说明",
-            prop: "dateDesc",
-            type: "textarea",
-            minRows: 1,
-            span: 6,
-          },
-          {
-            label: "有效日期",
-            prop: "dateValidity",
-            span: 6,
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00"
-          },
-          {
-            label: "销售订单号",
-            prop: "orderNo",
-            span: 6
-          },
-          {
-            label: "币别",
-            prop: "currency",
-            span: 6,
-            rules: [
-              {
-                required: true,
-                message: "",
-                trigger: "blur"
-              }
-            ]
-          },
-          {
             label: "汇率",
             prop: "exchangeRate",
             span: 6,
@@ -643,10 +622,21 @@ export default {
             label: "单票毛利",
             prop: "singleTicketMargin",
             span: 6,
-            row: true,
             disabled: true
           },
           {
+            label: "订单日期",
+            prop: "businesDate",
+            span: 6,
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur"
+              }
+            ]
+          },
+          {
             label: "箱型",
             prop: "boxPile",
             type: "select",
@@ -665,6 +655,7 @@ export default {
           {
             label: "起订量",
             prop: "minOrder",
+            row:true,
             span: 6
           },
           {