会计事项平台更新

src/views/businessVoucher/index.vue

@@ -14,20 +14,20 @@
     <div class="right" v-loading="tableLoading">
       <div class="topBox" style="margin-bottom: 10px">
         <div class="searchBox">
-          <div style="margin-left: 10px;display: flex;align-items: center">
+          <div style="margin-left: 5px;display: flex;align-items: center;">
-            单据号：
+            <div style="width: 100px">单据号：</div>
             <el-input v-model="searchObjTable.billCode" clearable></el-input>
           </div>
-          <div style="margin-left: 10px;display: flex;align-items: center">
+          <div style="margin-left: 5px;display: flex;align-items: center">
-            单据日期起：
+            <div>单据日期起：</div>
             <el-date-picker v-model="searchObjTable.timeStart" value-format="yyyy-MM-dd" type="date"></el-date-picker>
           </div>
-          <div style="margin-left: 10px;display: flex;align-items: center">
+          <div style="margin-left: 5px;display: flex;align-items: center">
-            单据日期止：
+            <div>单据日期止：</div>
             <el-date-picker v-model="searchObjTable.timeEnd" value-format="yyyy-MM-dd" type="date"></el-date-picker>
           </div>
-          <div style="margin-left: 10px;display: flex;align-items: center">
+          <div style="margin-left: 5px;display: flex;align-items: center">
-            生成状态：
+            <div style="width: 100px">生成状态：</div>
             <el-select
               class="w-100"
               v-model="searchObjTable.billStatus"
@@ -59,25 +59,18 @@
                     tableHeight="calc(50vh - 100px)" :tableData="tableData" :tableColumn="tableColumn"
                     @radioChange="radioChange" id="printMe"
         >
+          <template #billStatus="{row}">
+            <div>{{ row.billStatus === 'Y' ? '已生成' : '未生成' }}</div>
+          </template>
           <template #operation="{row}">
-            <div class="btnList">
+            <div @click="generateHandle(row)" style="cursor: pointer">
-              <div class="settingBtn" @click="generateHandle(row)">
+              生成
-                生成
-              </div>
             </div>
           </template>
         </base-table>
       </div>
       <!--      辅助核算-->
       <template v-if="this.selected.length">
-        <div class="leftTitle"
-             style="display: flex;align-items: center;justify-content: space-between;margin-top: 10px"
-        >
-          <div>辅助核算</div>
-          <div>
-            <el-button v-if="editFlag" size="mini" type="primary" @click="sonTableDataHandle">新增行</el-button>
-          </div>
-        </div>
         <div class="table">
           <base-table ref="customtable" :showIndex="false" :slotrow="false"
                       tableHeight="calc(50vh - 100px)" :tableData="this.selected[0].assistEntityList"
@@ -198,22 +191,39 @@ export default {
       assistTableData: [],
       assistTableColumn: [
         {
-          label: '辅助核算类型',
+          label: '账簿',
           prop: 'mdmName'
         },
         {
-          label: '辅助核算内容',
+          label: '单据日期',
-          prop: 'fieldName'
+          prop: 'fieldName',
+          width: 150
         },
         {
-          label: '备注',
+          label: '凭证类别',
-          prop: 'remark'
+          prop: 'remark',
+          width: 150
         },
         {
-          label: '操作',
+          label: '凭证号',
           prop: 'operation',
-          width: 60
+          width: 100
-        }
+        },
+        {
+          label: '摘要',
+          prop: 'operation',
+          width: 160
+        },
+        {
+          label: '借方',
+          prop: 'operation',
+          width: 160
+        },
+        {
+          label: '贷方',
+          prop: 'operation',
+          width: 160
+        },
       ],
       billTypeClickCode: '',
       masterTableData: [],
@@ -479,8 +489,7 @@ export default {
       tableColumn: [
         {
           label: '单据号',
-          prop: 'billCode',
+          prop: 'billCode'
-          width: 200
         },
         {
           label: '单据日期',
@@ -540,7 +549,7 @@ export default {
   },
   methods: {
     //生成方法
-    generateHandle(row){
+    generateHandle(row) {
 
     },
     async ixedValueFormelDialogClick(row) {
@@ -1844,7 +1853,13 @@ export default {
         align-items: center;
 
         > div {
-          margin-right: 10px;
+          margin-right: 5px;
+          display: flex;
+          align-items: center;
+          >div{
+            width: 140px;
+            text-align: right;
+          }
         }
       }
     }