Browse Source

no message

linwenxin 6 months ago
parent
commit
3be98b9af8

+ 42 - 40
src/views/setting/departmentManage/index.vue

@@ -99,7 +99,6 @@
                   </el-cascader>
                 </el-form-item>
               </el-col>
-
               <el-col :span="6">
                 <el-form-item label="所属公司" prop="belongCompanyCode">
                   <el-select
@@ -121,15 +120,6 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="保险支付商户" prop="payInsureCodeId">
-                  <el-select v-model="mainForm.payInsureCodeId" placeholder="请选择">
-                    <el-option v-for="item in PayConfigList" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="6">
                 <el-form-item label="网点名称" prop="name">
                   <el-input placeholder="请输入网点名称" v-model="mainForm.name"></el-input>
                 </el-form-item>
@@ -161,6 +151,25 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
+                <el-form-item label="状态" prop="status">
+                  <el-radio-group v-model="mainForm.status">
+                    <el-radio :label="true">启用</el-radio>
+                    <el-radio :label="false">禁用</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电子支付商户" prop="payWorkerCodeId">
+                  <el-select v-model="mainForm.payWorkerCodeId" placeholder="请选择">
+                    <el-option v-for="item in PayConfigList" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                  </el-select>
+                  <div style="margin-left: 5px; color: #fd8005; width: calc(100% + 120px); margin-left: -90px">
+                    配置师傅销售辅材配件给用户的电子支付收款商户
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
                 <el-form-item label="保险类型" prop="insureType">
                   <el-checkbox-group v-model="mainForm.insureType">
                     <el-checkbox label="意外险">意外险</el-checkbox>
@@ -170,6 +179,19 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
+                <el-form-item label="保险支付商户" prop="payInsureCodeId">
+                  <el-select v-model="mainForm.payInsureCodeId" placeholder="请选择">
+                    <el-option v-for="item in PayConfigList" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <!--  -->
+              <!--  -->
+              <!--  -->
+              <!--  -->
+              <!--  -->
+              <el-col :span="6">
                 <el-form-item label="企业法人" prop="legalName">
                   <el-input placeholder="请输入" v-model="mainForm.legalName"></el-input>
                 </el-form-item>
@@ -184,6 +206,14 @@
                   <el-input placeholder="请输入" v-model="mainForm.legalIdCard"></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="地址" prop="address">
+                  <div style="display: flex">
+                    <el-input placeholder="请选择地址" style="margin-right: 20px" v-model="mainForm.address"></el-input>
+                    <geographicalPosi :formData="mainForm" @selectPosi="selectAddress"></geographicalPosi>
+                  </div>
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="办公电话" prop="websitPhone">
                   <el-input placeholder="请输入" v-model="mainForm.websitPhone"></el-input>
@@ -210,11 +240,6 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="邮编" prop="zipCode">
-                  <el-input placeholder="请输入" v-model="mainForm.zipCode"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
                 <el-form-item label="联系人" prop="linkName">
                   <el-input placeholder="请输入联系人名称" v-model="mainForm.linkName"></el-input>
                 </el-form-item>
@@ -229,31 +254,9 @@
                   ></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="地址" prop="address">
-                  <div style="display: flex">
-                    <el-input placeholder="请选择地址" style="margin-right: 20px" v-model="mainForm.address"></el-input>
-                    <geographicalPosi :formData="mainForm" @selectPosi="selectAddress"></geographicalPosi>
-                  </div>
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
-                <el-form-item label="状态" prop="status">
-                  <el-radio-group v-model="mainForm.status">
-                    <el-radio :label="true">启用</el-radio>
-                    <el-radio :label="false">禁用</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="电子支付商户" prop="payWorkerCodeId">
-                  <el-select v-model="mainForm.payWorkerCodeId" placeholder="请选择">
-                    <el-option v-for="item in PayConfigList" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                  </el-select>
-                  <div style="margin-left: 5px; color: #fd8005; width: calc(100% + 120px); margin-left: -90px">
-                    配置师傅销售辅材配件给用户的电子支付收款商户
-                  </div>
+                <el-form-item label="邮编" prop="zipCode">
+                  <el-input placeholder="请输入" v-model="mainForm.zipCode"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -277,7 +280,6 @@
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-
               <el-col :span="24">
                 <el-form-item label="通联支付" prop="isUseAllinpay">
                   <el-switch v-model="mainForm.isUseAllinpay" active-color="#13ce66" inactive-color="#ff4949">

+ 1 - 1
src/views/setting/insuranceAdministration/InsuranceAgreement/InsuranceAgreementForm.vue

@@ -211,7 +211,7 @@ export default {
     paginationCallback({ pageIndex, pageSize }) {
       return new Promise(resolve => {
         resolve({
-          total: [],
+          total: 0,
           data: []
         })
       })

+ 1 - 1
src/views/setting/insuranceAdministration/InsuranceContract/InsuranceContractForm.vue

@@ -445,7 +445,7 @@ export default {
     paginationCallback({ pageIndex, pageSize }) {
       return new Promise(resolve => {
         resolve({
-          total: [],
+          total: 0,
           data: []
         })
       })