Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue

@@ -9,7 +9,6 @@
       </div>
     </div>
     <div class="listconadd">
-      <!--      <div class="wlInfo">经销商信息</div>-->
       <el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
         <div class="title">基本信息</div>
         <el-row style="border-top: 1px solid #DFE6EC">
@@ -17,8 +16,8 @@
             <span><span style="color: red">*</span>所属经销商</span>
           </el-col>
           <el-col :span="20">
-            <el-form-item prop="">
+            <el-form-item prop="pDistributorName">
-              <el-select v-model="temp.pDistributorName" class="addinputw" placeholder="请选择" @change="pDistributorSidChange" clearable>
+              <el-select v-model="temp.pDistributorName" style="width: 30%" placeholder="请选择" @change="pDistributorSidChange" clearable>
                 <el-option v-for="item in pDistributorSid_list" :key="item.sid" :label="item.disName" :value="item.disName"/>
               </el-select>
             </el-form-item>
@@ -34,10 +33,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="4" class="tleftb">
-            <span><span style="color: red">*</span>统一社会信用代码</span>
+            <span>统一社会信用代码</span>
           </el-col>
           <el-col :span="8">
-            <el-form-item prop="registNum">
+            <el-form-item>
               <el-input v-model="temp.registNum" maxlength="125" placeholder="请填写统一社会信用代码" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
@@ -62,9 +61,6 @@
               <!--              </el-select>-->
               <el-input v-model="temp.registDetailAddress" maxlength="125" placeholder="请填写详细地址" style="width:63%" clearable/> <!-- temp.registDetailAddress -->
             </el-form-item>
-            <!--          </el-col>-->
-            <!--          <el-col :span="12">-->
-
           </el-col>
         </el-row>
         <el-row>
@@ -72,7 +68,7 @@
             <span>实际经营地址</span>
           </el-col>
           <el-col :span="20">
-            <el-form-item prop=""> <!--  -->
+            <el-form-item prop="">
               <el-select v-model="managementProvinceCode" filterable placeholder="请选择省" class="filter-item" style="width: 12%" @change="getSheng02">
                 <el-option v-for="item in inputProvinceList02" :key="item.sid" :label="item.name" :value="item.districtCode"/>
               </el-select>
@@ -84,9 +80,6 @@
               </el-select>
               <el-input v-model="temp.managementDetailAddress" maxlength="125" placeholder="请填写详细地址" style="width:63%" clearable/> <!-- temp.managementDetailAddress -->
             </el-form-item>
-            <!--          </el-col>-->
-            <!--          <el-col :span="12">-->
-
           </el-col>
         </el-row>
         <el-row>
@@ -260,7 +253,6 @@
               <el-select v-model="scope.row.identityKey" class="addinputw" placeholder="请选择身份" @change="identityChange(scope.row,scope.row.identityKey)" clearable>
                 <el-option v-for="item in identity_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
-              <!--              <el-input v-model="scope.row.linkType" maxlength="125" placeholder="" class="addinputw" clearable/>-->
             </template>
           </el-table-column>
           <el-table-column label="手机号码" align="center">
@@ -278,9 +270,7 @@
         <div class="headline">
           <div style="margin-left: 5px;font-weight: bold">营业执照</div>
           <div>
-            <multifileUpload :accept="accept" ref="divUpload" :reminder="false" :showfile="false"
+            <multifileUpload :accept="accept" ref="divUpload" :reminder="false" :showfile="false" @handleSuccess="filesAdd($event, '0001')" @handleRemove="filesRemove"/>
-                             @handleSuccess="filesAdd($event, '0001')" @handleRemove="filesRemove"
-            />
           </div>
         </div>
         <el-table :key="businessLicenseKey" :data="list1" border style="width: 100%">
@@ -576,17 +566,15 @@ export default {
       dialogVisible: false,
       dataArr: [],
       rules: {
+        pDistributorName: [{ required: true, message: '请选择所属经销商', trigger: 'change' }],
         disName: [{ required: true, message: '请填写经销商名称', trigger: 'blur' }],
-        registNum: [{ required: true, message: '请填写统一社会信用代码', trigger: 'blur' }],
         registAll: [{ required: true, message: '请填写注册地址', trigger: 'blur' }],
         legalName: [{ required: true, message: '请填写实际控制人姓名', trigger: 'blur' }],
         legalMobile: [{ required: true, validator: checkSubmit, message: '请填写实际控制人联系电话', trigger: 'blur' }],
         invoPhone: [{ required: true, validator: checkKaipiaoDianhua, message: '请填写单位开票信息联系电话', trigger: 'change' }],
         invoBank: [{ required: true, message: '请填写开户行', trigger: 'blur' }],
         invoBankNum: [{ required: true, message: '请填写银行账号', trigger: 'blur' }]
-        // setUpTime: [{required: true, message: '请选择成立日期', trigger: 'blur'}],
       }
-      // ------------------------------------
     }
   },
   methods: {

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue

@@ -252,9 +252,9 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="success" icon="el-icon-check" size="small" @click="handlePayment">无需付款</el-button>
+        <el-button type="success" icon="el-icon-check" size="small" :disabled="submitdisabled" @click="handlePayment">无需付款</el-button>
-        <el-button type="success" icon="el-icon-check" size="small" @click="handlePass">通过</el-button>
+        <el-button type="success" icon="el-icon-check" size="small" :disabled="submitdisabled" @click="handlePass">通过</el-button>
-        <el-button type="info" icon="el-icon-close" size="small" @click="handColse">关闭</el-button>
+        <el-button type="info" icon="el-icon-close" size="small" :disabled="submitdisabled" @click="handColse">关闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -280,6 +280,7 @@ export default {
   data() {
     return {
       btndisabled: false,
+      submitdisabled: false,
       btnList: [
         {
           type: 'primary',
@@ -645,12 +646,18 @@ export default {
     },
     handlePayment() {
       this.formobj.sids = this.sids
+      this.submitdisabled = true
       req.updateAllState(this.formobj).then((resp) => {
         if (resp.success) {
+          this.submitdisabled = false
           this.$message({ showClose: true, type: 'success', message: '保存成功' })
           this.handColse()
           this.getList()
+        } else {
+          this.submitdisabled = false
         }
+      }).catch(() => {
+        this.submitdisabled = false
       })
     },
     handlePass() {
@@ -668,12 +675,18 @@ export default {
             this.$message({ showClose: true, type: 'error', message: '请上传付款凭证' })
             return
           }
+          this.submitdisabled = true
           req.update(this.formobj).then((resp) => {
             if (resp.success) {
+              this.submitdisabled = false
               this.$message({ showClose: true, type: 'success', message: resp.msg })
               this.handColse()
               this.getList()
+            } else {
+              this.submitdisabled = false
             }
+          }).catch(() => {
+            this.submitdisabled = false
           })
         } else {
           return false
@@ -739,6 +752,7 @@ export default {
         payCode: '', // 供应商编码
         cost: ''
       }
+      this.submitdisabled = false
       this.diploma_list = []
       this.$refs['form_obj'].resetFields()
     },

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue

@@ -70,7 +70,7 @@
         </el-row>
         <el-row>
           <el-col :span="4" class="tleftb">
-            <span><span class="icon">*</span>合同编号</span>
+            <span><span class="icon">*</span>公司合同编号</span>
           </el-col>
           <el-col :span="8">
             <el-form-item prop="concatNo">