Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_masterPlatform into dev

src/views/financed/accountsPayable/components/dislogCmsAudit.vue

@@ -1,7 +1,6 @@
 <template>
   <div>
     <BaseDialog
-      :disabledBtn="disabledBtn"
       width="860px"
       :isShow.sync="isShow"
       :title="'佣金' + ['详情', '审核', '支付'][type - 1]"

src/views/financed/accountsPayable/supplierSettlement/index.vue

@@ -29,7 +29,7 @@
               size="small"
               type="primary"
               @click="controlsType(1, { settleType: 1 })"
-              >数据结算</el-button
+              >数量结算</el-button
             >
             <el-button
               size="small"
@@ -68,7 +68,7 @@
       </template>
       <template slot="status" slot-scope="props">
         {{ getCheckStatus(props.scope.row.checkStatus) }}
-        <span style="color: red" v-if="props.scope.row.checkRole"
+        <span style="color: red" v-if="props.scope.row.checkRole && props.scope.row.checkStatus !== 6"
           >（{{ props.scope.row.checkRole }}）</span
         >
       </template>
@@ -83,7 +83,8 @@
               ($store.state.user.name == 'admin' &&
                 (props.scope.row.checkStatus == 2 ||
                   props.scope.row.checkStatus == 7)) ||
-              props.scope.row.checkStatus == 4 ||
+              (props.scope.row.checkStatus == 4 &&
+                props.scope.row.paySign == 1) ||
               props.scope.row.checkStatus == 7
             )
           "
@@ -126,6 +127,7 @@
           >单据打印</el-button
         >
         <el-button
+        v-if="props.scope.row.settleType == 1"
           :disabled="props.scope.row.checkStatus !== 6"
           type="text"
           class="warning_text_btn"

src/views/financed/accountsPayable/supplierSettlement/printData.vue

@@ -16,8 +16,8 @@
           <table border cellspacing="0" cellpadding="5" width="100%">
             <tr>
               <td>款项用途：供应商结算</td>
-              <td>付款日期：2022-12-12 12:12:12</td>
-              <td>付款金额：￥8000.00</td>
+              <td>付款日期：{{ $methodsTools.onlyForma(formData.payTime) }}</td>
+              <td>付款金额：￥{{ formData.settleMoney }}</td>
             </tr>
             <tr>
               <td>
@@ -102,6 +102,9 @@
                   <span v-if="items.scope === 'time'">{{
                     $methodsTools.onlyForma(item[items.prop])
                   }}</span>
+                  <div v-else-if="items.scope === 'businessList'">
+                    <div v-for="item in item[items.prop]">{{ item }}</div>
+                  </div>
                   <span v-else>
                     {{ items.leftCh }}{{ item[items.prop]
                     }}{{ items.prop1 ? item[items.prop1] : "" }}
@@ -149,7 +152,12 @@ export default {
         { label: "业务员", prop: "createUsername", width: "80" },
         { label: "业务号", prop: "createNo", width: "80" },
         { label: "下单客户", prop: "clientName" },
-        { label: "业务类型", prop: "educationName", prop1: "businessName" },
+        {
+          label: "业务类型",
+          prop: "businessNames",
+          scope: "businessList",
+          width: "180",
+        },
         { label: "姓名", prop: "userName", width: "60" },
         { label: "身份证号", prop: "userCard" },
         { label: "交资料日期", prop: "submitDataTime", scope: "time" },
@@ -181,7 +189,7 @@ export default {
       return function (array) {
         let num = 0;
         array.forEach((i) => (num += i.settleMoney));
-        return parseFloat(num);
+        return num.toFixed(2);
       };
     },
     isShow: {

src/views/financed/components/dislogOrderDetails.vue

@@ -355,7 +355,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.orderDetail {
+// .orderDetail {
   .head {
     margin-bottom: 20px;
     span {
@@ -363,5 +363,5 @@ export default {
       color: #409eff;
     }
   }
-}
+// }
 </style>

src/views/financed/components/studentDetails.vue

@@ -252,7 +252,7 @@ export default {
         index: 0,
         num: true,
         border: true,
-        choice: true,
+        choice: false,
         choiceRadio: false,
         openCheckMore: true,
         radioKey: "specTemplateId",
@@ -315,6 +315,7 @@ export default {
   computed: {
     computedTableSet: function () {
       return function (array, num) {
+        let copyArray = JSON.parse(JSON.stringify(array))
         if (num === 3) {
           let data = [
             {
@@ -338,9 +339,9 @@ export default {
               hidden: true,
             },
           ];
-          array.splice(array.length - 1, 1, ...data);
+          copyArray.splice(array.length - 1, 1, ...data);
         }
-        return array;
+        return copyArray;
       };
     },
   },

src/views/financed/orderManageList/operate/index.vue

@@ -390,7 +390,7 @@ export default {
       ],
       loading: false, //当前表单加载是否加载动画
       navText: {
-        title: "代操作订单",
+        title: "代运订单",
         index: 0,
         ch: "条",
         num: true,