Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml

@@ -80,8 +80,8 @@
 
     <select id="selectByVinSid" resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnveh.ReturnPushVo">
         SELECT ba.billNo,bo.materialCode
-        FROM base_vehicle_out bo
-                 left join base_vehicle_out_apply ba on ba.sid = bo.mainSid
+        FROM anrui_base.base_vehicle_out bo
+                 left join anrui_base.base_vehicle_out_apply ba on ba.sid = bo.mainSid
         where bo.materialTypeKey = '001' and bo.isDelete = 0 and bo.vinSid = #{vehSid}
     </select>
 </mapper>

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

@@ -481,11 +481,6 @@ export default {
           this.costType_list = res.data
         }
       })
-      getTypeValueList({ type: 'payCostType', groupNum: '001' }).then((res) => {
-        if (res.success) {
-          this.costTitle_list = res.data
-        }
-      })
       getInvoicingList({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.payCompany_list = res.data
@@ -580,6 +575,16 @@ export default {
         this.formobj.costTypeKey = ''
         this.formobj.isVeh = ''
       }
+      if (this.formobj.costTypeKey !== '' && this.formobj.costTypeKey !== '004') {
+        getTypeValueList({ type: 'payCostType', groupNum: this.formobj.costTypeKey }).then((res) => {
+          if (res.success) {
+            this.costTitle_list = res.data
+          }
+        })
+      } else {
+        this.costTitle_list = []
+      }
+      this.formobj.detailsList = []
     },
     isVehChange(val) {
       if (val === '1') {

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

@@ -497,11 +497,6 @@ export default {
           this.costType_list = res.data
         }
       })
-      getTypeValueList({ type: 'payCostType', groupNum: '001' }).then((res) => {
-        if (res.success) {
-          this.costTitle_list = res.data
-        }
-      })
       typeValues({ type: 'paymentType' }).then((res) => {
         if (res.success) {
           this.payment_list = res.data
@@ -571,6 +566,16 @@ export default {
         this.formobj.costTypeKey = ''
         this.formobj.isVeh = ''
       }
+      if (this.formobj.costTypeKey !== '' && this.formobj.costTypeKey !== '004') {
+        getTypeValueList({ type: 'payCostType', groupNum: this.formobj.costTypeKey }).then((res) => {
+          if (res.success) {
+            this.costTitle_list = res.data
+          }
+        })
+      } else {
+        this.costTitle_list = []
+      }
+      this.formobj.detailsList = []
     },
     isVehChange(val) {
       if (val === '1') {