凯合修改

src/api/kaihe/domesticTrade/orderInformation.js

@@ -106,10 +106,19 @@ export function getFName(data) {
     data: data
   })
 }
-//获取审批人
+//费用请核
 export function getfee(data) {
   return request({
-    url: '/warehouse/paths/projectEndQueryPendingVal',
+    url: '/khwarehouse/warehousebills/ruoYiSubmitMessage',
+    method: 'post',
+    data: data
+  })
+}
+//获取审批人
+
+export function getName(data) {
+  return request({
+    url: 'warehouse/paths/projectEndQueryPendingVal',
     method: 'post',
     data: data
   })

src/views/finance/charge/index.vue

@@ -306,7 +306,7 @@
             <span v-if="item.label == 'createBy'">{{scope.row.createBy}}</span>
             <span v-if="item.label == 'fBillno'">{{scope.row.fBillno}}</span>
             <span v-if="item.label == 'fCtrlcorpid'">{{scope.row.fCtrlcorpid}}</span>
-            <span v-if="item.label == 'createTime'">{{(scope.row.createTime).slice(0,10)}}</span>
+            <span v-if="item.label == 'createTime'">{{scope.row.createTime?scope.row.createTime.slice(0,10):''}}</span>
             <span v-if="item.label == 'fAccbilldate'">{{scope.row.fAccbilldate}}</span>
             <span v-if="item.label == 'tMblno'">{{scope.row.tMblno}}</span>
             <span v-if="item.label == 'chargingMethod'">{{scope.row.chargingMethod}}</span>

src/views/finance/contrast/index.vue

@@ -736,7 +736,7 @@
         v-dialogDrag
         :fullscreen="dialogFull"
         :close-on-click-modal="false"
-        width="70%"
+        width="78%"
         :title="title"
         :visible.sync="innerVisible"
         append-to-body
@@ -774,7 +774,7 @@
           :model="TWareHouseFees"
           ref="feeListRules"
           :rules="feeListRules"
-          label-width="80px"
+          label-width="78px"
           :inline="true"
         >
           <el-row>

src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -515,7 +515,7 @@
                       filterable
                       remote
                       :disabled="modify || scope.row.fSrcTypeId != 0"
-                      placeholder="客户名称"
+                      placeholder="请选择业务类型"
                     >
                       <el-option
                         v-for="dict in businessTypeOptions"
@@ -539,7 +539,7 @@
                       filterable
                       remote
                       :disabled="modify || scope.row.fSrcTypeId != 0"
-                      placeholder="客户名称"
+                      placeholder="请选择客户名称"
                     >
                       <el-option
                         v-for="item in nameOptions"
@@ -563,7 +563,7 @@
                       filterable
                       remote
                       :disabled="modify || scope.row.fSrcTypeId !== 0"
-                      placeholder="费用名称"
+                      placeholder="请选择费用名称"
                     >
                       <el-option
                         v-for="(dict, index) in fDNameOptions"
@@ -832,7 +832,7 @@
                       filterable
                       remote
                       :disabled="modify || scope.row.fSrcTypeId != 0"
-                      placeholder="客户名称"
+                      placeholder="请选择业务类型"
                     >
                       <el-option
                         v-for="dict in businessTypeOptions"
@@ -856,7 +856,7 @@
                       filterable
                       remote
                       :disabled="modify || scope.row.fSrcTypeId != 0"
-                      placeholder="客户名称"
+                      placeholder="请选择客户名称"
                     >
                       <el-option
                         v-for="item in nameOptions"
@@ -880,7 +880,7 @@
                 filterable
                 :disabled="modify || scope.row.fSrcTypeId !== 0"
                 remote
-                placeholder="费用名称"
+                placeholder="请选择费用名称"
               >
                 <el-option
                   v-for="(dict, index) in fCNameOptions"
@@ -905,7 +905,7 @@
                 remote
                 @change="changeFeeUnit(scope.row)"
                 :disabled="modify || scope.row.fSrcTypeId !== 0"
-                placeholder="计价单位"
+                placeholder="请选择计价单位"
               >
                 <el-option
                   v-for="(dict, index) in jFeetunitOptions"
@@ -1199,7 +1199,7 @@
 </template>
 
 <script>
-import { listCorps, addmodify, getCntr, postApproval, listFees,getGoodName,getFName,getfee} from '@/api/kaihe/domesticTrade/orderInformation'
+import { listCorps, addmodify, getCntr, postApproval, listFees,getGoodName,getFName,getfee,getName} from '@/api/kaihe/domesticTrade/orderInformation'
 import Global from '@/layout/components/global'
 import { getToken } from '@/utils/auth'
 import Cookies from 'js-cookie'
@@ -1366,7 +1366,7 @@ export default {
           actId:460,
           id:this.form.fId
         }
-        getfee(data).then(response=>{
+        getName(data).then(response=>{
           if(response.data.length != 0){
             this.before = response.data[0].userName
           }