Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationAdd.vue

@@ -127,7 +127,11 @@
         <el-row>
           <el-col :span="12">
             <div class="span-sty">开户行</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="temp.bank" clearable  placeholder=""/></el-form-item>
+            <el-form-item>
+              <el-select class="addinputInfo addinputw" v-model="formobj.bank" filterable placeholder="请选择" clearable>
+                <el-option v-for="item in bank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="12">
             <div class="span-sty">银行账号</div>
@@ -171,6 +175,7 @@ export default {
       payment_list: [],
       receiveCompany_list: [],
       receivingAccount_list: [],
+      bank_list: [],
       formobj: {
         sid: '', // sid
         costTitleKey: '', // 款项名称，数据字典
@@ -219,6 +224,11 @@ export default {
           this.payment_list = res.data
         }
       })
+      typeValues({ type: 'bank' }).then((res) => {
+        if (res.success) {
+          this.bank_list = res.data
+        }
+      })
     },
     showAdd(useOrgSid) {
       this.viewTitle = '【新增】付款信息'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue

@@ -72,7 +72,11 @@
         <el-row>
           <el-col :span="12">
             <div class="span-sty">开户行</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bank" clearable placeholder="" /></el-form-item>
+            <el-form-item>
+              <el-select class="addinputInfo addinputw" v-model="formobj.bank" filterable placeholder="请选择" clearable>
+                <el-option v-for="item in bank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="12">
             <div class="span-sty">银行账号</div>
@@ -115,6 +119,7 @@ export default {
   data() {
     return {
       dialogVisible: false,
+      bank_list: [],
       businessType_list: [],
       formobj: {
         companyCode: '', // 单位编码
@@ -189,6 +194,11 @@ export default {
           this.businessType_list = res.data
         }
       })
+      typeValues({ type: 'bank' }).then((res) => {
+        if (res.success) {
+          this.bank_list = res.data
+        }
+      })
     },
     // 搜索条件效果
     clicksearchShow() {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/paymentInformationAdd.vue

@@ -127,7 +127,11 @@
         <el-row>
           <el-col :span="12">
             <div class="span-sty">开户行</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="temp.bank" clearable  placeholder=""/></el-form-item>
+            <el-form-item>
+              <el-select class="addinputInfo addinputw" v-model="formobj.bank" filterable placeholder="请选择" clearable>
+                <el-option v-for="item in bank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="12">
             <div class="span-sty">银行账号</div>
@@ -171,6 +175,7 @@ export default {
       payment_list: [],
       receiveCompany_list: [],
       receivingAccount_list: [],
+      bank_list: [],
       formobj: {
         sid: '', // sid
         costTitleKey: '', // 款项名称，数据字典
@@ -219,6 +224,11 @@ export default {
           this.payment_list = res.data
         }
       })
+      typeValues({ type: 'bank' }).then((res) => {
+        if (res.success) {
+          this.bank_list = res.data
+        }
+      })
     },
     showAdd(useOrgSid) {
       this.viewTitle = '【新增】付款信息'

yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue

@@ -343,9 +343,13 @@ export default {
       const choose = this.warehouseList.filter((item) => item.sid === val)
       if (choose !== null && choose.length > 0) {
         this.queryParams.params.warehouseName = choose[0].warehouseName
+        this.queryParams.params.warehouseAreaName = ''
+        this.queryParams.params.warehouseRackCode = ''
         this.getWarehouseAreaList(choose[0].sid)
       } else {
         this.queryParams.params.warehouseName = ''
+        this.queryParams.params.warehouseAreaName = ''
+        this.queryParams.params.warehouseRackCode = ''
       }
     },
     getWarehouseAreaList(sid) {
@@ -359,9 +363,11 @@ export default {
       const choose = this.warehouseAreaList.filter((item) => item.sid === val)
       if (choose !== null && choose.length > 0) {
         this.queryParams.params.warehouseAreaName = choose[0].areaName
+        this.queryParams.params.warehouseRackCode = ''
         this.getWareHouseCodeList(choose[0].sid)
       } else {
         this.queryParams.params.warehouseAreaName = ''
+        this.queryParams.params.warehouseRackCode = ''
       }
     },
     getWareHouseCodeList(sid) {

yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue

@@ -340,9 +340,13 @@ export default {
       const choose = this.warehouseList.filter((item) => item.sid === val)
       if (choose !== null && choose.length > 0) {
         this.queryParams.params.warehouseName = choose[0].warehouseName
+        this.queryParams.params.warehouseAreaName = ''
+        this.queryParams.params.warehouseRackCode = ''
         this.getWarehouseAreaList(choose[0].sid)
       } else {
         this.queryParams.params.warehouseName = ''
+        this.queryParams.params.warehouseAreaName = ''
+        this.queryParams.params.warehouseRackCode = ''
       }
     },
     getWarehouseAreaList(sid) {
@@ -356,9 +360,11 @@ export default {
       const choose = this.warehouseAreaList.filter((item) => item.sid === val)
       if (choose !== null && choose.length > 0) {
         this.queryParams.params.warehouseAreaName = choose[0].areaName
+        this.queryParams.params.warehouseRackCode = ''
         this.getWareHouseCodeList(choose[0].sid)
       } else {
         this.queryParams.params.warehouseAreaName = ''
+        this.queryParams.params.warehouseRackCode = ''
       }
     },
     getWareHouseCodeList(sid) {