修改图标合并

src/components/Comon/pictureList.vue

@@ -52,6 +52,8 @@ export default {
     cursor: pointer;
     transition: all 0.3s;
     box-shadow: 0px 0px 4px 1px rgba(0, 0, 0, 0.2);
+    background-color: rgb(243,249,255);
+    padding: 4px;
     &:hover {
       transform: scale(1.04);
     }
@@ -65,20 +67,20 @@ export default {
     margin-bottom: 10px;
     & > img {
       margin-left: 2px;
-      width: 40px;
-      height: 40px;
+      width: 32px;
+      height: 32px;
     }
     & > .right {
       flex: 1;
       padding-left: 4px;
       & > h4 {
-        color: #000;
+        color: rgb(85, 85, 85);
         margin: 0;
         font-size: 12px;
       }
       & > p {
         font-size: 12px;
-        color: red;
+        color: #000;
         margin: 0;
       }
     }

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

@@ -76,9 +76,12 @@
         <el-button
           type="text"
           :disabled="
-            props.scope.row.checkStatus !== 7 &&
-            props.scope.row.checkStatus !== 4 &&
-            $store.state.user.name !== 'admin'
+            !(
+              ($store.state.user.name == 'admin' &&
+                props.scope.row.checkStatus == 2) ||
+              props.scope.row.checkStatus == 4 ||
+              props.scope.row.checkStatus == 7
+            )
           "
           @click="controlsType(3, props.scope.row)"
           >{{ props.scope.row.checkStatus == 4 ? "支付" : "审核" }}</el-button
@@ -152,7 +155,11 @@
       :dialogVisible.sync="BaseDialogDetailsTime"
       :activeData="activeData"
     />
-    <payMent :dialogVisible.sync="BaseDialogPayMent" :activeData="activeData" />
+    <payMent
+      :dialogVisible.sync="BaseDialogPayMent"
+      :activeData="activeData"
+      @search="search"
+    />
     <printData
       :dialogVisible.sync="BaseDialogPrintData"
       :activeData="activeData"

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

@@ -106,10 +106,31 @@ export default {
   },
   methods: {
     init() {
-      this.formData = Object.assign({}, this.activeData);
+      this.$api.settlepayinfodata(this.activeData.settleId).then((res) => {
+        this.formData = res.data;
+      });
     },
     close() {},
-    submitForm() {},
+    submitForm() {
+      this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$api
+            .settlepay({ settleId: this.formData.settleId })
+            .then((res) => {
+              this.$message({
+                type: "success",
+                message: "支付成功",
+              });
+              this.isShow = false;
+              this.$emit("search");
+            });
+        })
+        .catch(() => {});
+    },
   },
   computed: {
     isShow: {

src/views/financed/components/dislogOrderDetails.vue

@@ -11,14 +11,16 @@
         订单号：<span>{{ detailInfo.orderSn }}</span> 退款状态：<span>{{
           refundStatus(detailInfo.refundStatus)
         }}</span>
-        <i v-if="detailInfo.orderFrom === 3" style="font-style: normal"
+        <i
+          v-if="detailInfo.orderFrom === 3 || detailInfo.orderFrom === 4"
+          style="font-style: normal"
           >审核状态：<span>{{ checkStatus(detailInfo.checkStatus) }}</span></i
         >
         <i
           v-if="
-            ShowStatus &&
+            ShowStatus == 2 &&
             detailInfo.checkStatus === 0 &&
-            detailInfo.orderFrom !== 3
+            (detailInfo.orderFrom == 3 || detailInfo.orderFrom == 4)
           "
           style="float: right"
         >

src/views/financed/components/refund/dislogSet.vue

@@ -4,7 +4,7 @@
       :disabledBtn="disabledBtn"
       width="600px"
       :isShow.sync="isShow"
-      title="'退款审核"
+      title="退款审核"
       @close="close"
       @submit="submitForm"
       :confirmName="form.checkType === 3 ? '确定支付' : '确定'"
@@ -138,7 +138,6 @@ export default {
       type: String,
       default: "",
     },
-    
   },
   data() {
     return {

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

@@ -152,7 +152,7 @@
       <template slot="btn" slot-scope="props">
         <el-button
           type="text"
-          @click="openDialog(props.scope.row)"
+          @click="openDialog(props.scope.row, 1)"
           :disabled="disabledStatus(props.scope.row.commercialTenant)"
           >查看详情</el-button
         >
@@ -750,11 +750,7 @@ export default {
       this.tpId = item.orderSn;
     },
     openDialog(data, e) {
-      if (e === 1) {
-        this.ShowStatus = 2;
-      } else {
-        this.ShowStatus = 1;
-      }
+      this.ShowStatus = e;
       this.orderInfo = data;
       this.orderSn = data.orderSn;
       this.orderDialogVisible = true;
@@ -900,6 +896,8 @@ export default {
     cursor: pointer;
     transition: all 0.3s;
     box-shadow: 0px 0px 4px 1px rgba(0, 0, 0, 0.2);
+    background-color: rgb(243,249,255);
+    padding: 4px;
     &:hover {
       transform: scale(1.04);
     }
@@ -913,20 +911,20 @@ export default {
     margin-bottom: 10px;
     & > img {
       margin-left: 2px;
-      width: 40px;
-      height: 40px;
+      width: 32px;
+      height: 32px;
     }
     & > .right {
       flex: 1;
       padding-left: 4px;
       & > h4 {
-        color: #000;
+        color: rgb(85, 85, 85);
         margin: 0;
         font-size: 12px;
       }
       & > p {
         font-size: 12px;
-        color: red;
+        color: #000;
         margin: 0;
       }
     }

src/views/financed/orderManageList/index.vue

@@ -20,7 +20,9 @@
       <el-button type="primary" size="small" @click="editRemarks(1)"
         >修改备注</el-button
       >
-      <el-button size="small" @click="exportData" v-hasRole="derivePermission">导出excel</el-button>
+      <el-button size="small" @click="exportData" v-hasRole="derivePermission"
+        >导出excel</el-button
+      >
     </div>
     <div class="dis_flex_order_li">
       <div class="list" v-for="(item, index) in ShowTabList" :key="index">
@@ -145,7 +147,7 @@
       <template slot="btn" slot-scope="props">
         <el-button
           type="text"
-          @click="openDialog(props.scope.row)"
+          @click="openDialog(props.scope.row, 1)"
           :disabled="disabledStatus(props.scope.row.commercialTenant)"
           >查看详情</el-button
         >
@@ -157,7 +159,7 @@
         >
         <el-button
           type="text"
-          @click="openDialog(props.scope.row, 1)"
+          @click="openDialog(props.scope.row, 2)"
           :disabled="
             props.scope.row.orderFrom !== 3 ||
             props.scope.row.checkStatus === 3 ||
@@ -783,11 +785,7 @@ export default {
       this.tpId = item.orderSn;
     },
     openDialog(data, e) {
-      if (e === 1) {
-        this.ShowStatus = 2;
-      } else {
-        this.ShowStatus = 1;
-      }
+      this.ShowStatus = e;
       this.orderInfo = data;
       this.orderSn = data.orderSn;
       this.orderDialogVisible = true;
@@ -909,6 +907,7 @@ export default {
 .cell > .el-button + .el-button {
   // margin-left: 0px;
 }
+
 .dis_flex_order_li {
   display: flex;
   align-items: center;
@@ -918,6 +917,8 @@ export default {
     cursor: pointer;
     transition: all 0.3s;
     box-shadow: 0px 0px 4px 1px rgba(0, 0, 0, 0.2);
+    background-color: rgb(243,249,255);
+    padding: 4px;
     &:hover {
       transform: scale(1.04);
     }
@@ -931,23 +932,23 @@ export default {
     margin-bottom: 10px;
     & > img {
       margin-left: 2px;
-      width: 40px;
-      height: 40px;
+      width: 32px;
+      height: 32px;
     }
     & > .right {
       flex: 1;
       padding-left: 4px;
       & > h4 {
-        color: #000;
+        color: rgb(85, 85, 85);
         margin: 0;
         font-size: 12px;
       }
       & > p {
         font-size: 12px;
-        color: red;
+        color: #000;
         margin: 0;
       }
     }
   }
 }
-</style>
+</style>

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

@@ -168,11 +168,12 @@
       <template slot="btn" slot-scope="props">
         <el-button
           type="text"
-          @click="openDialog(props.scope.row)"
+          @click="openDialog(props.scope.row, 1)"
           :disabled="disabledStatus(props.scope.row.commercialTenant)"
           >查看详情</el-button
         >
         <el-button
+          v-if="orderFormShow(props.scope.row)"
           type="text"
           @click="handelClickCost(props.scope.row)"
           :disabled="disabledStatus(props.scope.row.commercialTenant)"
@@ -180,18 +181,23 @@
         >
         <el-button
           type="text"
-          @click="openDialog(props.scope.row, 1)"
+          @click="openDialog(props.scope.row, 2)"
           :disabled="
-            props.scope.row.orderFrom !== 3 ||
-            props.scope.row.checkStatus === 3 ||
+            (props.scope.row.orderFrom !== 3 &&
+              props.scope.row.orderFrom !== 4) ||
+            props.scope.row.checkStatus !== 0 ||
             disabledStatus(props.scope.row.commercialTenant)
           "
           >订单审核</el-button
         >
-        <el-button type="text" @click="handelClick(props.scope.row, 1)"
+        <el-button
+          v-if="orderFormShow(props.scope.row) && false"
+          type="text"
+          @click="handelClick(props.scope.row, 1)"
           >学员审核</el-button
         >
         <el-button
+          v-if="orderFormShow(props.scope.row)"
           type="text"
           @click="handelClick(props.scope.row, 2)"
           :disabled="
@@ -203,18 +209,21 @@
           >退款审核</el-button
         >
         <el-button
+          v-if="orderFormShow(props.scope.row)"
           type="text"
           @click="editRemarks(props.scope.row)"
           :disabled="disabledStatus(props.scope.row.commercialTenant)"
           >修改备注</el-button
         >
         <el-button
+          v-if="orderFormShow(props.scope.row)"
           type="text"
           @click="seePZ(props.scope.row.attachmentList)"
           :disabled="disabledStatus(props.scope.row.commercialTenant)"
           >转账凭证</el-button
         >
         <el-button
+          v-if="orderFormShow(props.scope.row)"
           type="text"
           :disabled="
             !(
@@ -226,6 +235,7 @@
           >完单确认</el-button
         >
         <el-button
+          v-if="orderFormShow(props.scope.row)"
           type="text"
           :disabled="
             props.scope.row.finishStatus !== 1 ||
@@ -403,47 +413,6 @@ export default {
       },
       //搜索
       formList: [
-        // {
-        //   prop: "roleId",
-        //   placeholder: "角色分类",
-        //   scope: "select",
-        //   options: [
-        //     { label: "会计", value: 0 },
-        //     { label: "财务", value: 1 },
-        //     { label: "出纳", value: 2 },
-        //   ],
-        // },
-        // {
-        //   prop: "businessFullName",
-        //   placeholder: "业务分类",
-        //   scope: "select",
-        //   options: [
-        //     { label: "学校业务", value: 1 },
-        //     { label: "办证质询", value: 2 },
-        //   ],
-        // },
-        // {
-        //   prop: "invoiceStatus",
-        //   placeholder: "开票状态",
-        //   scope: "select",
-        //   options: [
-        //     { label: "已开票", value: 1 },
-        //     { label: "未开票", value: 0 },
-        //   ],
-        // },
-        // {
-        //   placeholder: "审核时间",
-        //   prop1: "checkStartTime",
-        //   prop2: "checkEndTime",
-        //   placeholder1: "审核开始日期",
-        //   placeholder2: "审核结束日期",
-        //   scope: "moreDataPicker",
-        //   Diszing: true,
-        // },
-        // {
-        //   prop: "userCard",
-        //   placeholder: "身份号",
-        // },
         {
           prop: "educationTypeId",
           placeholder: "教育类型",
@@ -685,6 +654,9 @@ export default {
     this.getStatistics(this.formData);
   },
   methods: {
+    orderFormShow(row) {
+      return row.orderFrom == 4 ? false : true;
+    },
     getRoles(roleId) {
       if (
         (this.$store.state.user.rolesId?.length > 0 &&
@@ -828,11 +800,7 @@ export default {
       this.tpId = item.orderSn;
     },
     openDialog(data, e) {
-      if (e === 1) {
-        this.ShowStatus = 2;
-      } else {
-        this.ShowStatus = 1;
-      }
+      this.ShowStatus = e;
       this.orderInfo = data;
       this.orderSn = data.orderSn;
       this.orderDialogVisible = true;
@@ -978,6 +946,8 @@ export default {
     cursor: pointer;
     transition: all 0.3s;
     box-shadow: 0px 0px 4px 1px rgba(0, 0, 0, 0.2);
+    background-color: rgb(243,249,255);
+    padding: 4px;
     &:hover {
       transform: scale(1.04);
     }
@@ -991,20 +961,20 @@ export default {
     margin-bottom: 10px;
     & > img {
       margin-left: 2px;
-      width: 40px;
-      height: 40px;
+      width: 32px;
+      height: 32px;
     }
     & > .right {
       flex: 1;
       padding-left: 4px;
       & > h4 {
-        color: #000;
+        color: rgb(85, 85, 85);
         margin: 0;
         font-size: 12px;
       }
       & > p {
         font-size: 12px;
-        color: red;
+        color: #000;
         margin: 0;
       }
     }