Преглед изворни кода

Merge branch 'develop_fybx02' of jianguan-web/jg-ocs-html into pre-release

李磊 пре 3 година
родитељ
комит
8a5f21dff9

+ 7 - 1
src/views/expenseManagement/expenseReimbursement/add.vue

@@ -79,10 +79,16 @@
               @click="handleDel(record)"
             >删除</a-button>
           </template>
+          <!-- 记账名称 -->
+          <template slot="jzname" slot-scope="text,record">
+            <div>{{ text }}</div>
+            <div v-if="record.accountNameFnumber">({{ record.accountNameFnumber }})</div>
+          </template>
           <!-- 费用承担方 -->
           <template slot="fycdf" slot-scope="text,record">
             <div v-for="(item,index) in record.detailSplitList" :key="item.id+'-'+index">
               {{ item.splitObjName }}
+              <span v-if="item.splitObjFnumber">({{ item.splitObjFnumber }})</span>
               <span v-if="item.childDetailSplit&&item.childDetailSplit.splitObjName">/</span>
               {{ item.childDetailSplit?item.childDetailSplit.splitObjName:'' }}: ¥{{ item.childDetailSplit?item.childDetailSplit.splitAmount:item.splitAmount }}
             </div>
@@ -176,7 +182,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '记账类型', dataIndex: 'accountTypeDictValue', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
-        { title: '记账名称', dataIndex: 'accountName', align: 'center', width: '10%', customRender: function (text) { return text || '--' } },
+        { title: '记账名称', dataIndex: 'accountName', scopedSlots: { customRender: 'jzname' }, align: 'center', width: '10%' },
         { title: '所属区域', dataIndex: 'subareaNames', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '所属省份', dataIndex: 'provinceName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '所属城市', dataIndex: 'cityName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },

+ 7 - 1
src/views/expenseManagement/expenseReimbursement/detail.vue

@@ -71,10 +71,16 @@
           :showPagination="false"
           :defaultLoadData="true"
           bordered>
+          <!-- 记账名称 -->
+          <template slot="jzname" slot-scope="text,record">
+            <div>{{ text }}</div>
+            <div v-if="record.accountNameFnumber">({{ record.accountNameFnumber }})</div>
+          </template>
           <!-- 费用承担方 -->
           <template slot="fycdf" slot-scope="text,record">
             <div v-for="(item,index) in record.detailSplitList" :key="item.id+'-'+index">
               {{ item.splitObjName }}
+              <span v-if="item.splitObjFnumber">({{ item.splitObjFnumber }})</span>
               <span v-if="item.childDetailSplit&&item.childDetailSplit.splitObjName">/</span>
               {{ item.childDetailSplit?item.childDetailSplit.splitObjName:'' }}: ¥{{ item.childDetailSplit?item.childDetailSplit.splitAmount:item.splitAmount }}
             </div>
@@ -133,7 +139,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '记账类型', dataIndex: 'accountTypeDictValue', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
-        { title: '记账名称', dataIndex: 'accountName', align: 'center', width: '14%', customRender: function (text) { return text || '--' } },
+        { title: '记账名称', dataIndex: 'accountName', scopedSlots: { customRender: 'jzname' }, align: 'center', width: '14%' },
         { title: '所属区域', dataIndex: 'subareaNames', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '所属省份', dataIndex: 'provinceName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '所属城市', dataIndex: 'cityName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },

+ 2 - 1
src/views/expenseManagement/expenseReimbursement/previewModal.vue

@@ -55,7 +55,7 @@
               <td style="text-align: left;width:17%;padding:5px 10px;">
                 <div>{{ item.accountTypeDictValue }}</div>
                 <div>{{ item.accountName||'' }}</div>
-                <!-- <div>{{ item.expenseAccountNo }}</div> -->
+                <div v-if="item.accountNameFnumber">({{ item.accountNameFnumber }})</div>
               </td>
               <td style="text-align: left;width:15%;padding:5px 10px;">
                 <div>{{ item.subareaNames }}</div>
@@ -66,6 +66,7 @@
               <td style="text-align: left;width:28%;padding:5px 10px;vertical-align: top;">
                 <div v-for="(ditem,index) in item.detailSplitList" :key="ditem.id+'-'+index" style="padding: 3px 0;" >
                   {{ ditem.splitObjName }}
+                  <span v-if="ditem.splitObjFnumber">({{ ditem.splitObjFnumber }})</span>
                   <span v-if="ditem.childDetailSplit&&ditem.childDetailSplit.splitObjName">/</span>
                   {{ ditem.childDetailSplit?ditem.childDetailSplit.splitObjName:'' }}: {{ ditem.childDetailSplit?ditem.childDetailSplit.splitAmount:ditem.splitAmount }}元
                 </div>

+ 8 - 5
src/views/expenseManagement/expenseReimbursement/productInfoModal.vue

@@ -214,10 +214,10 @@ export default {
       // 校验数据
       const retList = JSON.parse(JSON.stringify(this.dataList))
       console.log(retList)
-      if (retList.length == 0) {
-        this.$message.info('请添加产品信息')
-        return
-      }
+      // if (retList.length == 0) {
+      //   this.$message.info('请添加产品信息')
+      //   return
+      // }
       let hasError = 0
       retList.map(item => {
         if (!item.expense) {
@@ -238,7 +238,10 @@ export default {
         return
       }
       this.spinning = true
-      expenseAcctDetailSaveProducts(retList).then(res => {
+      expenseAcctDetailSaveProducts({
+        'expenseAccountDetailSn': this.expenseAccountDetailSn,
+        'detailProductsList': retList
+      }).then(res => {
         this.spinning = false
         if (res.status == 200) {
           this.$message.success(res.message)

+ 3 - 1
src/views/expenseManagement/expenseReimbursementDetail/list.vue

@@ -159,7 +159,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ y: tableHeight,x:1770 }"
+        :scroll="{ y: tableHeight,x:2010 }"
         :defaultLoadData="false"
         bordered>
       </s-table>
@@ -253,11 +253,13 @@ export default {
         { title: '主题', dataIndex: 'title', align: 'center', width: 150, customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '记账类型', dataIndex: 'accountTypeDictValue', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '记账名称', dataIndex: 'accountName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '财务编码', dataIndex: 'accountNameFnumber', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所属区域', dataIndex: 'subareaNames', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所属省份', dataIndex: 'provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所属城市', dataIndex: 'cityName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '记账费用', dataIndex: 'expense', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '费用承担方', dataIndex: 'splitObjName', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '财务编码', dataIndex: 'splitObjFnumber', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '费用承担金额', dataIndex: 'splitAmount', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '费用承担人', dataIndex: 'childSplitObjName', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '人员平摊费用', dataIndex: 'childSplitAmount', width: 120, align: 'center', customRender: function (text) { return text || '--' } }

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.16.155:8602/ocs-admin',
+        // target: 'http://192.168.16.105:8602/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  Á·Ï°
         target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
         ws: false,