Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq

sgzb-ui/src/api/claimAndRefund/receive.js

@@ -2,22 +2,22 @@ import request from '@/utils/request'
 
 // 往来单位-下拉
 export function getUnitList(query) {
-    return request({
+  return request({
-      url: '/material/agreementInfo/getUnitList',
+    url: '/material/agreementInfo/getUnitList',
-      method: 'get',
+    method: 'get',
-      params: query
+    params: query
-    })
+  })
-  }
+}
 
 
 // 工程名称-下拉
 export function getProjectList(query) {
-    return request({
+  return request({
-      url: '/material/agreementInfo/getProjectList',
+    url: '/material/agreementInfo/getProjectList',
-      method: 'get',
+    method: 'get',
-      params: query
+    params: query
-    })
+  })
-  }
+}
 
 // 协议管理-列表
 export function getAgreementList(query) {
@@ -29,12 +29,12 @@ export function getAgreementList(query) {
 }
 // 协议管理-详情
 export function getAgreementInfoId(query) {
-    return request({
+  return request({
-      url: '/material/agreementInfo/getAgreementInfoId',
+    url: '/material/agreementInfo/getAgreementInfoId',
-      method: 'get',
+    method: 'get',
-      params: query
+    params: query
-    })
+  })
-  }
+}
 
 //协议管理--新增
 export function addAgreement(data) {
@@ -47,20 +47,20 @@ export function addAgreement(data) {
 
 // 协议管理--修改
 export function updateAgreement(data) {
-    return request({
+  return request({
-      url: '/material/agreementInfo/update',
+    url: '/material/agreementInfo/update',
-      method: 'post',
+    method: 'post',
-      data: data
+    data: data
-    })
+  })
-  }
+}
 // //协议管理--删除
 export function removeAgreement(data) {
-    return request({
+  return request({
-      url: '/material/agreementInfo/remove',
+    url: '/material/agreementInfo/remove',
-      method: 'post',
+    method: 'post',
-      data: data
+    data: data
-    })
+  })
-  }
+}
 
 // 机具领料-申请列表
 export function getLeaseManageListAll(query) {
@@ -88,7 +88,7 @@ export function getLeaseAuditListAll(query) {
 }
 
 // 获取 来往单位 列表
-export function getUnitData(params = {}){
+export function getUnitData(params = {}) {
   return request({
     url: '/system/select/getUnitCbx',
     method: 'post',
@@ -97,7 +97,7 @@ export function getUnitData(params = {}){
 }
 
 // 获取 工程 列表
-export function getProData(params = {}){
+export function getProData(params = {}) {
   return request({
     url: '/system/select/getSectionEngineeringCbx',
     method: 'post',
@@ -106,7 +106,7 @@ export function getProData(params = {}){
 }
 
 //  获取 设备树
-export function getDeviceTypeTree(params = {}){
+export function getDeviceTypeTree(params = {}) {
   return request({
     url: '/system/select/getDeviceTypeTree',
     method: 'post',
@@ -115,76 +115,76 @@ export function getDeviceTypeTree(params = {}){
 }
 
 // 根据单位id和工程id  获取 协议id
-export function getAgreementInfoById(params = {}){
+export function getAgreementInfoById(params = {}) {
   return request({
-    url:'/system/select/getAgreementInfoById',
+    url: '/system/select/getAgreementInfoById',
-    method:'post',
+    method: 'post',
-    data:params
+    data: params
   })
 }
 
 //提交 领料申请
-export function submitLeaseApply(params = {}){
+export function submitLeaseApply(params = {}) {
   return request({
-    url:'/base/tm_task/submitLeaseApply',
+    url: '/base/tm_task/submitLeaseApply',
     method: 'post',
-    data:params
+    data: params
   })
 }
 
 //编辑 领料申请
-export function editLeaseApply(params = {}){
+export function editLeaseApply(params = {}) {
   return request({
-    url:'/base/tm_task/edit',
+    url: '/base/tm_task/edit',
     method: 'post',
-    data:params
+    data: params
   })
 }
 
 // 参数 领料任务
-export function deleteTask( taskId ){
+export function deleteTask(taskId) {
   return request({
-    url:`/base/tm_task/${taskId}`,
+    url: `/base/tm_task/${taskId}`,
-    method:'delete'
+    method: 'delete'
   })
 }
 
 // 根据 领料任务id  获取详情数据
-export function getLeaseListAll( params = {} ){
+export function getLeaseListAll(params = {}) {
   return request({
     url: '/base/tm_task/getLeaseListAll',
-    method:'get',
+    method: 'get',
-    params:params
+    params: params
   })
 }
 // 根据 领料任务id  获取详情数据
-export function getLeaseListAllCq( params = {} ){
+export function getLeaseListAllCq(params = {}) {
   return request({
     url: '/base/tm_task/getLeaseListAllCq',
-    method:'get',
+    method: 'get',
-    params:params
+    params: params
   })
 }
 
 // 领料审核  同意
-export function auditLeaseByCompany(params = {} ){
+export function auditLeaseByCompany(params = {}) {
   return request({
-    url:'/base/tm_task/auditLeaseByCompany',
+    url: '/base/tm_task/auditLeaseByCompany',
-    method:'post',
+    method: 'post',
-    data:params
+    data: params
   })
 }
 // 领料审核  同意
-export function auditLeaseByCompanyCq(params = {} ){
+export function auditLeaseByCompanyCq(params = {}) {
   return request({
-    url:'/base/tm_task/auditLeaseByCompanyCq',
+    url: '/base/tm_task/auditLeaseByCompanyCq',
-    method:'post',
+    method: 'post',
-    data:params
+    data: params
   })
 }
 
 // 领料审核  拒绝
-export function rejectLeaseByCompany(params = {}){
+export function rejectLeaseByCompany(params = {}) {
   return request({
     url: '/base/tm_task/rejectLeaseByCompany',
     method: 'post',
@@ -192,7 +192,7 @@ export function rejectLeaseByCompany(params = {}){
   })
 }
 // 领料审核  拒绝
-export function rejectLeaseByCompanyCq(params = {}){
+export function rejectLeaseByCompanyCq(params = {}) {
   return request({
     url: '/base/tm_task/rejectLeaseByCompanyCq',
     method: 'post',
@@ -201,7 +201,7 @@ export function rejectLeaseByCompanyCq(params = {}){
 }
 
 //  获取 物品类型
-export function getUseTypeTreee(params = {}){
+export function getUseTypeTreee(params = {}) {
   return request({
     url: '/material/backApply/getUseTypeTree',
     method: 'post',
@@ -256,7 +256,7 @@ export function getDetailsByTypeId(query) {
 }
 
 // 领料出库  编码出库 保存
-export function submitOut(params){
+export function submitOut(params) {
   return request({
     url: '/base/leaseOutDetails/submitOutRfid',
     method: 'post',
@@ -265,7 +265,7 @@ export function submitOut(params){
 }
 
 // 领料出库  数量出库 保存
-export function submitNumOut(params){
+export function submitNumOut(params) {
   return request({
     url: '/base/leaseOutDetails/submitOutRfid',
     method: 'post',
@@ -273,17 +273,17 @@ export function submitNumOut(params){
   })
 }
 
-	// 领料确认 
+// 领料确认 
-  export function updateLeaseTaskStatusConfirmByCq(params){
+export function updateLeaseTaskStatusConfirmByCq(params) {
-    return request({
+  return request({
-      url: '/base/tm_task/updateLeaseTaskStatusConfirmByCq',
+    url: '/base/tm_task/updateLeaseTaskStatusConfirmByCq',
-      method: 'post',
+    method: 'post',
-      data: params
+    data: params
-    })
+  })
-  }
+}
-  
+
 // 当前在用量
-export function getUseNumByTypeId(params){
+export function getUseNumByTypeId(params) {
   return request({
     url: '/material/backApply/getUseNumByTypeId',
     method: 'get',
@@ -292,7 +292,7 @@ export function getUseNumByTypeId(params){
 }
 
 // 批量审核
-export function auditAll(params){
+export function auditAll(params) {
   return request({
     url: '/material/backApply/auditAll',
     method: 'post',
@@ -300,6 +300,14 @@ export function auditAll(params){
   })
 }
 
+// 获取费用承担方
+export function getCostBearingApi() {
+  return request({
+    url: '/base/dic/pid',
+    method: 'get',
+  })
+}
+
 
 
 

sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue

@@ -17,6 +17,7 @@
                     clearable
                     style="width: 240px"
                     :disabled="isEdit"
+                    @change="leaseTypeChange"
                 >
                     <el-option
                         v-for="item in typeList"
@@ -112,6 +113,27 @@
                     onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
                 />
             </el-form-item>
+            <el-form-item
+                label="费用承担方"
+                prop="costBearingParty"
+                v-if="queryParams.leaseType && queryParams.leaseType == 0"
+            >
+                <el-select
+                    v-model="queryParams.costBearingParty"
+                    filterable
+                    clearable
+                    style="width: 240px"
+                    placeholder="请选择费用承担方"
+                    :disabled="isEdit"
+                >
+                    <el-option
+                        v-for="item in costBearingList"
+                        :key="item"
+                        :label="item"
+                        :value="item"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
             <el-form-item label="备注" prop="roleName">
                 <el-input
                     maxlength="100"
@@ -248,6 +270,7 @@ import {
     editLeaseApply,
     getLeaseApplyListAll,
     getLeaseApplyAuditListAll,
+    getCostBearingApi,
 } from '@/api/claimAndRefund/receive'
 import { getInfo } from '@/api/login'
 export default {
@@ -407,6 +430,13 @@ export default {
                         trigger: 'change',
                     },
                 ],
+                costBearingParty: [
+                    {
+                        required: true,
+                        message: '请选择费用承担方',
+                        trigger: 'change',
+                    },
+                ],
                 // leasePerson: [
                 //   {
                 //     required: true, message: '请输入领料人', trigger: 'blur',
@@ -462,6 +492,7 @@ export default {
                     },
                 ],
             },
+            costBearingList: [],
         }
     },
     mounted() {
@@ -471,6 +502,8 @@ export default {
 
         this.GetProData()
 
+        this.getCostBearingFun()
+
         this.GetDeviceTypeTree()
         // this.getList();
         if (this.$route.query.taskId && !this.$route.query.isBack) {
@@ -565,6 +598,7 @@ export default {
                 this.queryParams.examineStatusId = '32'
             }
             this.queryParams.unitId = data.unitId
+            this.queryParams.costBearingParty = data?.costBearingParty
             this.queryParams.proId = data.proId
             this.queryParams.leaseApplyInfo.phone =
                 data.leaseApplyInfoList[0].phone
@@ -599,6 +633,7 @@ export default {
             }
             this.queryParams.unitId = data.unitId
             this.queryParams.proId = data.proId
+            this.queryParams.costBearingParty = data?.costBearingParty
             this.queryParams.leaseApplyInfo.phone =
                 data.leaseApplyInfoList[0].phone
             this.queryParams.leaseApplyInfo.leasePerson =
@@ -836,6 +871,21 @@ export default {
 
             return template
         },
+
+        // 获取费用承担方
+        async getCostBearingFun() {
+            const { data: res } = await getCostBearingApi()
+            this.costBearingList = res
+        },
+
+        // 领用类型修改时清空费用承担方
+        leaseTypeChange(val) {
+            if (val == 0) {
+                this.$set(this.queryParams, 'costBearingParty', '')
+            } else {
+                this.$delete(this.queryParams, 'costBearingParty')
+            }
+        },
     },
 }
 </script>

sgzb-ui/vue.config.js

@@ -42,7 +42,7 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        target: `http://10.40.92.60:28080`, //超
+        target: `http://192.168.2.167:28080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
         // target: `http://10.40.92.138:28080`, //帅