qymljy 1 year ago
parent
commit
dd9ef07701

+ 6 - 6
src/Form/accountsOverdueAdjustment/add.vue

@@ -13,14 +13,14 @@
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
             <el-col :span="12">
-              <el-form-item label="客户:" prop="sys_enterpriseid">
+              <el-form-item label="客户qqq:" prop="sys_enterpriseid">
                 <el-popover
                     placement="bottom"
                     width="700"
                     trigger="click"
                     v-model="customer.show"
                     @show="customerList">
-                  <tableTemplate ref="customer" :param="customer.param" :layout="customer.tablecols" height="280px" :custom="true" :width="true" @rowClick="customerSelect">
+                  <tableTemplate ref="customer" :param="customer.param" :layout="customer.tablecols" height="280px" :custom="true" :width="true" :isPagination="false" @rowClick="customerSelect">
                     <template v-slot:customcol="scope">
                       <p>{{scope.column.data[scope.column.columnname]}}</p>
                     </template>
@@ -37,7 +37,7 @@
                     trigger="click"
                     v-model="order.show"
                     @show="orderList">
-                  <tableTemplate ref="order" :param="order.param" :layout="order.tablecols" height="280px" :custom="true" :width="true" @rowClick="orderSelect">
+                  <tableTemplate ref="order" :param="order.param" :layout="order.tablecols" height="280px" :custom="true" :width="true" :isPagination="false" @rowClick="orderSelect">
                     <template v-slot:customcol="scope">
                       <p>{{scope.column.data[scope.column.columnname]}}</p>
                     </template>
@@ -153,7 +153,7 @@ export default {
         param:{
           "id": 20240320140704,
           "content": {
-            "pageSize": 20,
+            "pageSize": 9999,
             "pageNumber": 1,
             "where": {
               "condition": "",
@@ -167,7 +167,7 @@ export default {
           "id": 20240306135104,
           "content": {
             "pageNumber": 1,
-            "pageSize": 20,
+            "pageSize": 9999,
             "sys_enterpriseid": '',
             "where": {
               "condition": ""
@@ -182,7 +182,7 @@ export default {
           "content": {
             "sa_orderid": "",
             "pageNumber": 1,
-            "pageSize": 999,
+            "pageSize": 9999,
             "where": {
               "condition": ""
             }

+ 3 - 3
src/HDrpManagement/collectionRule/components/edit.vue

@@ -101,9 +101,9 @@ export default {
       this.auditList = this.data.accountingnodes.ordercheck
       this.shipmentList = this.data.accountingnodes.logisticscheck
       this.invoiceList = this.data.accountingnodes.invoiceapplycheck
-      this.auditIsUsed = this.auditList?this.auditList.length>0?this.auditList[0].isused:'0':'0'
-      this.shipmentIsUsed = this.shipmentList?this.shipmentList.length>0?this.shipmentList[0].isused:'0':'0'
-      this.invoiceIsUsed = this.invoiceList?this.invoiceList.length>0?this.invoiceList[0].isused:'0':'0'
+      this.auditIsUsed = this.auditList?this.auditList.length>0?'1':'0':'0'
+      this.shipmentIsUsed = this.shipmentList?this.shipmentList.length>0?'1':'0':'0'
+      this.invoiceIsUsed = this.invoiceList?this.invoiceList.length>0?'1':'0':'0'
       this.$nextTick(()=>{
         this.auditList.forEach(item=>{
           item.amountrate = Math.round((item.amountrate * 100)*100)/100

+ 17 - 0
src/HDrpManagement/collectionRule/components/indexNew.vue

@@ -0,0 +1,17 @@
+<template>
+  <div>
+    <div v-if="data[0].isused == '1'" style="color: red">是</div>
+    <div v-else>--</div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "indexNew",
+  props:['data']
+}
+</script>
+
+<style scoped>
+
+</style>

+ 11 - 75
src/HDrpManagement/collectionRule/modules/table.vue

@@ -27,18 +27,8 @@
             width="70">
             <template slot-scope="scope">
               <div v-if="scope.row.accountingnodes">
-                <div v-if="scope.row.accountingnodes.ordercheck.length > 0">
-                  <div style="color: red">是</div>
-                </div>
-                <div v-else>
-                  <div v-if="scope.row.accountingnodes.ordercheck.isused == '1'" style="color: red">是</div>
-                  <div v-else>--</div>
-                </div>
+                <indexNew :data="scope.row.accountingnodes.ordercheck"></indexNew>
               </div>
-              <div v-else>--</div>
-
-<!--              <div v-if="scope.row.point == '订单审核'" style="color: red">是</div>
-              <div v-else>--</div>-->
             </template>
           </el-table-column>
           <el-table-column
@@ -47,17 +37,9 @@
             width="70">
             <template slot-scope="scope">
               <div v-if="scope.row.accountingnodes">
-                <div v-if="scope.row.accountingnodes.ordercheck.length > 0">
-                  <tableColumn :data="scope.row.accountingnodes.ordercheck" name="days"></tableColumn>
-                </div>
-                <div v-else>
-                  <div v-if="scope.row.accountingnodes.ordercheck.days">{{scope.row.accountingnodes.ordercheck.days}}</div>
-                  <div v-else>--</div>
-                </div>
+                <tableColumn :data="scope.row.accountingnodes.ordercheck" name="days"></tableColumn>
               </div>
               <div v-else>--</div>
-<!--              <div v-if="scope.row.point == '订单审核'">{{scope.row.days}}</div>
-              <div v-else>--</div>-->
             </template>
           </el-table-column>
           <el-table-column
@@ -67,14 +49,7 @@
               width="70">
             <template slot-scope="scope">
               <div v-if="scope.row.accountingnodes">
-                <div v-if="scope.row.accountingnodes.ordercheck.length > 0">
-                  <tableColumn :data="scope.row.accountingnodes.ordercheck" name="amountrate"></tableColumn>
-                </div>
-                <div v-else>
-                  <div v-if="scope.row.accountingnodes.ordercheck.amountrate">{{scope.row.accountingnodes.ordercheck.amountrate}}%</div>
-                  <div v-else>--</div>
-                </div>
-
+                <tableColumn :data="scope.row.accountingnodes.ordercheck" name="amountrate"></tableColumn>
               </div>
               <div v-else>--</div>
               <!--              <div v-if="scope.row.point == '订单审核'">{{scope.row.amountrate * 100}}%</div>
@@ -91,15 +66,8 @@
             width="100">
             <template slot-scope="scope">
               <div v-if="scope.row.accountingnodes">
-                <div v-if="scope.row.accountingnodes.logisticscheck.length > 0">
-                  <div style="color: red">是</div>
-                </div>
-                <div v-else>
-                  <div v-if="scope.row.accountingnodes.logisticscheck.isused == '1'" style="color: red">是</div>
-                  <div v-else>--</div>
-                </div>
+                <indexNew :data="scope.row.accountingnodes.logisticscheck"></indexNew>
               </div>
-              <div v-else>--</div>
             </template>
           </el-table-column>
 
@@ -109,13 +77,7 @@
             width="70">
             <template slot-scope="scope">
               <div v-if="scope.row.accountingnodes">
-                <div v-if="scope.row.accountingnodes.logisticscheck.length > 0">
-                  <tableColumn :data="scope.row.accountingnodes.logisticscheck" name="days"></tableColumn>
-                </div>
-                <div v-else>
-                  <div v-if="scope.row.accountingnodes.logisticscheck.days">{{scope.row.accountingnodes.logisticscheck.days}}</div>
-                  <div v-else>--</div>
-                </div>
+                <tableColumn :data="scope.row.accountingnodes.logisticscheck" name="days"></tableColumn>
               </div>
               <div v-else>--</div>
             </template>
@@ -126,13 +88,7 @@
               width="70">
             <template slot-scope="scope">
               <div v-if="scope.row.accountingnodes">
-                <div v-if="scope.row.accountingnodes.logisticscheck.length > 0">
-                  <tableColumn :data="scope.row.accountingnodes.logisticscheck" name="amountrate"></tableColumn>
-                </div>
-                <div v-else>
-                  <div v-if="scope.row.accountingnodes.logisticscheck.amountrate">{{scope.row.accountingnodes.logisticscheck.amountrate}}%</div>
-                  <div v-else>--</div>
-                </div>
+                <tableColumn :data="scope.row.accountingnodes.logisticscheck" name="amountrate"></tableColumn>
               </div>
               <div v-else>--</div>
             </template>
@@ -146,16 +102,9 @@
             label="发票审核"
             width="70">
             <template slot-scope="scope">
-              <div v-if="scope.row.accountingnodes">
-                <div v-if="scope.row.accountingnodes.invoiceapplycheck.length > 0">
-                  <div style="color: red">是</div>
-                </div>
-                <div v-else>
-                  <div v-if="scope.row.accountingnodes.invoiceapplycheck.isused == '1'" style="color: red">是</div>
-                  <div v-else>--</div>
-                </div>
+               <div v-if="scope.row.accountingnodes">
+                <indexNew :data="scope.row.accountingnodes.invoiceapplycheck"></indexNew>
               </div>
-              <div v-else>--</div>
             </template>
           </el-table-column>
 
@@ -165,14 +114,7 @@
             width="70">
             <template slot-scope="scope">
               <div v-if="scope.row.accountingnodes">
-                <div v-if="scope.row.accountingnodes.invoiceapplycheck.length > 0">
-                  <tableColumn :data="scope.row.accountingnodes.invoiceapplycheck" name="days"></tableColumn>
-                </div>
-                <div v-else>
-                  <div v-if="scope.row.accountingnodes.invoiceapplycheck.days">{{scope.row.accountingnodes.invoiceapplycheck.days}}</div>
-                  <div v-else>--</div>
-                </div>
-
+                <tableColumn :data="scope.row.accountingnodes.invoiceapplycheck" name="days"></tableColumn>
               </div>
               <div v-else>--</div>
             </template>
@@ -183,14 +125,7 @@
               width="70">
             <template slot-scope="scope">
               <div v-if="scope.row.accountingnodes">
-                <div v-if="scope.row.accountingnodes.invoiceapplycheck.length > 0">
                   <tableColumn :data="scope.row.accountingnodes.invoiceapplycheck" name="amountrate"></tableColumn>
-                </div>
-                <div v-else>
-                  <div v-if="scope.row.accountingnodes.invoiceapplycheck.amountrate">{{scope.row.accountingnodes.invoiceapplycheck.amountrate}}%</div>
-                  <div v-else>--</div>
-                </div>
-
               </div>
               <div v-else>--</div>
             </template>
@@ -223,13 +158,14 @@
 <script>
 import edit from '../components/edit'
 import tableColumn from "@/HDrpManagement/collectionRule/components/tableColumn";
+import indexNew from "@/HDrpManagement/collectionRule/components/indexNew";
 export default {
   props:['tableData'],
   data () {
     return {
     }
   },
-  components:{edit,tableColumn},
+  components:{edit,tableColumn,indexNew},
   methods: {
     goDetail (data) {
       let query = {id:data.sa_receivableruleid,rowindex:data.rowindex}

+ 3 - 3
src/SDrpManagement/accountsReceivable/modules/detailInfo.vue

@@ -23,18 +23,18 @@
           </template>
           <template v-slot:opreation="scope"></template>
         </tableNewLayout>
-        <div class="container normal-panel" style="text-align:right">
+<!--        <div class="container normal-panel" style="text-align:right">
           <el-pagination
               background
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page="currentPage"
-              :page-sizes="[100, 50, 100, 200]"
+              :page-sizes="[100,150, 200]"
               :page-size="100"
               layout="total,sizes, prev, pager, next, jumper"
               :total="total">
           </el-pagination>
-        </div>
+        </div>-->
       </div>
     </el-drawer>
   </div>