Browse Source

Merge branch 'develop_yh52' of jianguan-web/qpls-md-html into pre-release

李磊 4 months ago
parent
commit
aed3870470

+ 14 - 6
src/views/supplierManagement/supplierInfo/editModal.vue

@@ -200,12 +200,19 @@ export default {
         if (res.status == 200) {
           if (res.data.provinceSn) { this.getArea('city', res.data.provinceSn) }
           if (res.data.citySn) { this.getArea('district', res.data.citySn) }
-          this.form = Object.assign(this.form, res.data)
-          this.form.enabledFlag = Number(this.form.enabledFlag)
-          if (!this.itemId) {
-            this.form.supplierSn = undefined
-            this.form.sysFlag = undefined
-          }
+          this.form.supplierName = res.data.supplierName
+          this.form.provinceSn = res.data.provinceSn
+          this.form.provinceName = res.data.provinceName
+          this.form.citySn = res.data.citySn
+          this.form.cityName = res.data.cityName
+          this.form.countySn = res.data.countySn
+          this.form.countyName = res.data.countyName
+          this.form.supplierAddress = res.data.supplierAddress
+          this.form.contactPerson = res.data.contactPerson
+          this.form.contactTel = res.data.contactTel
+          this.form.businessScope = res.data.businessScope
+          this.form.sysFlag = res.data.sysFlag
+          this.form.enabledFlag = Number(res.data.enabledFlag)
         }
       })
     },
@@ -307,6 +314,7 @@ export default {
       this.form.businessScope = undefined
       this.form.enabledFlag = 1
       this.form.supplierSn = undefined
+      this.form.sysFlag = undefined
       this.addrCityList = []
       this.addrDistrictList = []
       this.$refs.ruleForm.resetFields()

+ 1 - 1
src/views/supplierManagement/supplierInfo/list.vue

@@ -45,7 +45,7 @@
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
         <a-button
-          v-if="$hasPermissions('B_supplier_supplierInfo_edit') && record.tenantId!=0"
+          v-if="$hasPermissions('B_supplier_supplierInfo_edit') && record.tenantId!=0 && record.sysFlag!=1"
           size="small"
           type="link"
           class="button-primary"