我的账户，业务员账户、业务员收入、业务员支出、提成发放新增调整后差额字段

src/Form/commissionDistribution/add.vue

@@ -105,6 +105,9 @@
                   <div v-else-if="scope.column.columnname === 'afterrebateamount'">
                     {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
                   </div>
+                  <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                  </div>
                   <div v-else>
                     {{ scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation' ? scope.column.data[[scope.column.columnname]] : '--' }}
                   </div>

src/Form/salerExpenditure/add.vue

@@ -102,6 +102,9 @@
                     <div v-else-if="scope.column.columnname === 'afterrebateamount'">
                       {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
                     </div>
+                    <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                    </div>
                     <div v-else>
                       {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}
                     </div>

src/SDrpManagement/commissionDistribution/detail/components/income.vue

@@ -64,6 +64,9 @@
         <div v-else-if="scope.column.columnname === 'afterrebateamount'">
           {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
         </div>
+        <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+        </div>
         <div v-else-if="scope.column.columnname === 'amount'">
           <div v-if="data.status != '发放' ">
             <el-input v-model.number="scope.column.data.amount" placeholder="本次发放金额" @change="amountChange(scope.column.data.amount,scope.column.data)" size="small"></el-input>

src/SDrpManagement/commissionDistribution/index.vue

@@ -58,6 +58,9 @@
         <div v-else-if="scope.data.column.columnname === 'amount'">
           <span style="color: red">{{scope.data.column.data.amount?tool.formatAmount(scope.data.column.data.amount,2):scope.data.column.data.amount == 0?tool.formatAmount(0,2):'--'}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname === 'subhrcashbilldetailamount'">
+          {{scope.data.column.data[[scope.data.column.columnname]]?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'0.00':'--'}}
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.columnname !== 'operation'?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>

src/SDrpManagement/myaccountclass/index.vue

@@ -40,7 +40,7 @@
               </el-input>
             </div>
           </template>
-          <tableMainLayout :layout="tablecols" :data="list" :opwidth="200" :width="true" :custom="true" :fixedName="'operation'" height="calc(100vh - 430px)">
+          <tableMainLayout :layout="siteid == 'HY' && usertype == '1'?tablecolsSale:tablecols" :data="list" :opwidth="200" :width="true" :custom="true" :fixedName="'operation'" height="calc(100vh - 430px)">
             <template v-slot:customcol="scope">
               <div v-if="scope.column.columnname == 'type'">
                 {{ scope.column.data.type ? '收入' : '支出' }}
@@ -61,6 +61,12 @@
                   {{ scope.column.data[[scope.column.columnname]] ? scope.column.data[[scope.column.columnname]] : '--' }}
                 </span>
               </div>
+              <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+                {{scope.column.data[[scope.column.columnname]]?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'0.00':'--'}}
+              </div>
+              <div v-else-if="scope.column.columnname === 'amount'">
+                {{scope.column.data[[scope.column.columnname]]?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'0.00':'--'}}
+              </div>
               <div v-else>
                 {{ scope.column.data[[scope.column.columnname]] ? scope.column.data[[scope.column.columnname]] : '--' }}
               </div>
@@ -100,8 +106,10 @@
             <span style="font-size: 14px">{{checkDate}}</span>
           </div>-->
         </div>
-        <tableTemplate style="margin-top: 10px" ref="table" :layout="drawType?tablecolsIncome:tablecolsPay" :data="voucherList" :opwidth="200" :custom="true" height="calc(100vh - 170px)">
-          <template v-slot:customcol="scope">
+        <tableTemplate style="margin-top: 10px" ref="table" :layout="drawType?siteid == 'HY' && usertype == '1'?tablecolsIncomeSale:tablecolsIncome:siteid == 'HY' && usertype == '1'?tablecolsPaySale:tablecolsPay" :data="voucherList" :opwidth="200" :custom="true" height="calc(100vh - 170px)" :headerOptions="['orderamount']">
+          <template v-slot:header="scope" >
+          </template>
+          <template v-slot:customcol="scope" >
             <div v-if="scope.column.columnname === 'amount'">
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
             </div>
@@ -129,6 +137,9 @@
             <div v-else-if="scope.column.columnname === 'cashbilldetailamount'">
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
             </div>
+            <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+            </div>
             <div v-else-if="scope.column.columnname === 'rate'">
               {{scope.column.data[[scope.column.columnname]]?Math.round(tool.formatAmount(scope.column.data[[scope.column.columnname]]*100)*100)/100 + '%':scope.column.data[[scope.column.columnname]] == 0?'0%':'--'}}
             </div>
@@ -138,6 +149,8 @@
             <div v-else>
               {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}
             </div>
+
+
           </template>
         </tableTemplate>
         <div  style="text-align:right;float: right;margin-top: 10px">
@@ -168,6 +181,7 @@ export default {
       activeName:0,
       acountlist:[],
       tablecols:[],
+      tablecolsSale:[],
       list:[],
       param: {
         "id":20230111103403,
@@ -212,11 +226,14 @@ export default {
       dateSelect:[],
       usertype:JSON.parse(sessionStorage.getItem('active_account')).usertype,
       hrid:JSON.parse(sessionStorage.getItem('active_account')).hrid,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
       drawTitle:'',
       drawType:'',
       dialogVisible:false,
       tablecolsIncome:[],
       tablecolsPay:[],
+      tablecolsIncomeSale:[],
+      tablecolsPaySale:[],
       voucherList:[],
       voucherTotal:0,
       voucherCurrentPage:0,
@@ -338,6 +355,9 @@ export default {
     this.tablecols = this.tool.tabelCol(this.$route.name)['accountMoneyDetailTable'].tablecols
     this.tablecolsIncome = this.tool.tabelCol(this.$route.name)['incomeVoucherDetailsTable'].tablecols
     this.tablecolsPay = this.tool.tabelCol(this.$route.name)['payVoucherDetailsTable'].tablecols
+    this.tablecolsSale = this.tool.tabelCol(this.$route.name)['accountMoneySaleTable'].tablecols
+    this.tablecolsIncomeSale = this.tool.tabelCol(this.$route.name)['incomeVoucherSaleTable'].tablecols
+    this.tablecolsPaySale = this.tool.tabelCol(this.$route.name)['payVoucherSaleTable'].tablecols
   },
 }
 

src/SDrpManagement/salerAccount/modules/detail.vue

@@ -47,7 +47,10 @@
               {{scope.column.data[[scope.column.columnname]] == '1' ? '收入':'支出'}}
             </div>
             <div v-else-if="scope.column.columnname === 'amount'">
-              {{tool.formatAmount(scope.column.data[[scope.column.columnname]],2)}}
+              {{scope.column.data[[scope.column.columnname]]?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'0.00':'--'}}
+            </div>
+            <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+              {{scope.column.data[[scope.column.columnname]]?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'0.00':'--'}}
             </div>
             <div v-else>
               {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/salerExpenditure/detail/components/income.vue

@@ -60,6 +60,9 @@
         <div v-else-if="scope.column.columnname === 'afterrebateamount'">
           {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
         </div>
+        <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+        </div>
         <div v-else>
           {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}
         </div>

src/SDrpManagement/salerExpenditure/detail/modules/income/add.vue

@@ -46,7 +46,7 @@
             <div v-else-if="scope.column.columnname === 'afterrebateprice'">
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
             </div>
-            <div v-else-if="scope.column.columnname === 'afterrebateamount'">
+            <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
             </div>
             <div v-else>

src/SDrpManagement/salerExpenditure/index.vue

@@ -46,7 +46,10 @@
           <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '新建'?'#333333':'#52c41a'}">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'amount'">
-          <span style="color: red">{{tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2)}}</span>
+          <span style="color: red">{{scope.data.column.data[[scope.data.column.columnname]]?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'0.00':'--'}}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname === 'subhrcashbilldetailamount'">
+          {{scope.data.column.data[[scope.data.column.columnname]]?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'0.00':'--'}}
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.columnname !== 'operation'?scope.data.column.data[[scope.data.column.columnname]]:'--'}}

src/SDrpManagement/salerIncome/detail/components/commissionDetails.vue

@@ -61,6 +61,9 @@
         <div v-else-if="scope.column.columnname === 'afterrebateamount'">
           {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
         </div>
+        <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+        </div>
         <div v-else>
           {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}
         </div>

src/SDrpManagement/salerIncome/index.vue

@@ -49,7 +49,10 @@
           <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '新建'?'#333333':'#52c41a'}">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'amount'">
-          <span style="color: red">{{tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2)}}</span>
+          <span style="color: red">{{scope.data.column.data[[scope.data.column.columnname]]?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'0.00':'--'}}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname === 'subhrcashbilldetailamount'">
+          {{scope.data.column.data[[scope.data.column.columnname]]?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'0.00':'--'}}
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.columnname !== 'operation'?scope.data.column.data[[scope.data.column.columnname]]:'--'}}