更改搜索项

src/components/searchBoxNew.vue

@@ -13,32 +13,6 @@
         >
       </div>
     </div>
-    <div class="inputListBox" v-if="pendingType">
-      <div class="fon_s">审核状态：</div>
-      <div>
-        <el-button
-          :type="formData.periodStatus === item.value ? 'primary' : ''"
-          :size="size"
-          v-for="(item, index) in pendlists"
-          :key="index"
-          @click="topPendingType(item.value)"
-          >{{ item.label }}</el-button
-        >
-      </div>
-    </div>
-    <div class="inputListBox" v-if="classStatus">
-      <div class="fon_s">开班状态：</div>
-      <div>
-        <el-button
-          :type="formData.classStatus === item.value ? 'primary' : ''"
-          :size="size"
-          v-for="(item, index) in classType"
-          :key="index"
-          @click="topClassType(item.value)"
-          >{{ item.label }}</el-button
-        >
-      </div>
-    </div>
     <div class="inputListBox" v-if="shType">
       <div class="fon_s">审核状态：</div>
       <div>
@@ -52,31 +26,6 @@
         >
       </div>
     </div>
-    <div class="inputListBox" v-if="hoursType">
-      <div class="fon_s">审核状态：</div>
-      <div>
-        <el-button
-          :type="formData.periodStatus === item.value ? 'primary' : ''"
-          :size="size"
-          v-for="(item, index) in lists6"
-          :key="index"
-          @click="topHoursSearchsh(item.value)"
-          >{{ item.label }}</el-button
-        >
-      </div>
-    </div>
-    <!-- <div class="inputListBox" v-if="classType">
-      <div>
-        <el-button
-          :type="formData.goodsType === item.value ? 'primary' : ''"
-          :size="size"
-          v-for="(item, index) in classLists"
-          :key="index"
-          @click="classSearch(item.value)"
-          >{{ item.label }}</el-button
-        >
-      </div>
-    </div> -->
     <div class="inputListBoxs">
       <div
         class="fon_s"
@@ -321,20 +270,6 @@
               :value="items.value"
             ></el-option>
           </el-select>
-          <!-- 试卷类型 -->
-          <el-select
-            v-else-if="item.scope === 'paperType'"
-            v-model="formData[item.prop]"
-            :placeholder="item.placeholder"
-            :size="size"
-          >
-            <el-option
-              v-for="(items, indexs) in paperType"
-              :key="indexs"
-              :label="items.label"
-              :value="items.value"
-            ></el-option>
-          </el-select>
           <!-- 证书类型 -->
           <el-select
             v-else-if="item.scope === 'certificate'"
@@ -349,90 +284,6 @@
               :value="items.id"
             ></el-option>
           </el-select>
-          <!-- 考试标题 -->
-          <el-select
-            v-else-if="item.scope === 'examLists'"
-            v-model="formData[item.prop]"
-            :placeholder="item.placeholder"
-            :size="size"
-          >
-            <el-option
-              v-for="(items, indexs) in examLists"
-              :key="indexs"
-              :label="items.applyName"
-              :value="items.applyId"
-            ></el-option>
-          </el-select>
-          <!-- 考试标题：只显示已启用 -->
-          <el-select
-            v-else-if="item.scope === 'examList'"
-            v-model="formData[item.prop]"
-            :placeholder="item.placeholder"
-            :size="size"
-          >
-            <el-option
-              v-for="(items, indexs) in examList"
-              :key="indexs"
-              :label="items.applyName"
-              :value="items.applyId"
-            ></el-option>
-          </el-select>
-          <!-- 考试地点 -->
-          <el-select
-            v-else-if="item.scope === 'applySiteAddress'"
-            v-model="formData[item.prop]"
-            :placeholder="item.placeholder"
-            :size="size"
-          >
-            <el-option
-              v-for="(items, indexs) in applySiteAddress"
-              :key="indexs"
-              :label="items.siteAddress"
-              :value="item.getType === 1 ? items.siteAddress : items.siteId"
-            ></el-option>
-          </el-select>
-          <!-- 考试地点:手动过滤 -->
-          <el-select
-            v-else-if="item.scope === 'applySiteAddressX'"
-            v-model="formData[item.prop]"
-            :placeholder="item.placeholder"
-            :size="size"
-          >
-            <el-option
-              v-for="(items, indexs) in applySiteAddressX"
-              :key="indexs"
-              :label="items.siteAddress"
-              :value="item.getType === 1 ? items.siteAddress : items.siteId"
-            ></el-option>
-          </el-select>
-          <!-- 前培标题：只显示启用 -->
-          <el-select
-            v-else-if="item.scope === 'beforeList'"
-            v-model="formData[item.prop]"
-            :placeholder="item.placeholder"
-            :size="size"
-          >
-            <el-option
-              v-for="(items, indexs) in beforeList"
-              :key="indexs"
-              :label="items.beforeName"
-              :value="items.beforeId"
-            ></el-option>
-          </el-select>
-          <!-- 前培标题 -->
-          <el-select
-            v-else-if="item.scope === 'beforeLists'"
-            v-model="formData[item.prop]"
-            :placeholder="item.placeholder"
-            :size="size"
-          >
-            <el-option
-              v-for="(items, indexs) in beforeLists"
-              :key="indexs"
-              :label="items.beforeName"
-              :value="items.beforeId"
-            ></el-option>
-          </el-select>
           <!-- 自定义select -->
           <el-select
             :clearable="item.noClear === false ? false : true"
@@ -643,19 +494,15 @@
 
 <script>
 import { mapGetters } from "vuex";
-import handout from "../newApi/handout";
 export default {
   props: [
     "formList",
     "topType",
-    "pendingType",
     "formData",
     "shType",
-    "hoursType",
     "redIcon",
     "advanced",
     "advancedName",
-    "classStatus",
   ], //参考文档 component.md
   data() {
     return {
@@ -893,24 +740,6 @@ export default {
       };
     },
   },
-  watch: {
-    /**
-     *
-     * @param {Number} val
-     * @remards 考试计划监听-获取对应考试地点
-     */
-    "formData.applyId"(val) {
-      const Astatus = this.formList.some((item) => {
-        return item.scope === "applySiteAddressX";
-      });
-      if (Astatus) {
-        this.getChangeAdress(val);
-        if (this.formData.applySiteAddress) {
-          this.formData.applySiteAddress = "";
-        }
-      }
-    },
-  },
   methods: {
     /**
      * 手动过滤考试地点
@@ -974,24 +803,6 @@ export default {
       this.formData.goodsType = status;
       this.$emit("search", 3);
     },
-    /**
-     *
-     * @param {int} status
-     * @remark 顶部定制按钮-根据审核状态类型点击快速搜索
-     */
-    topPendingType(status) {
-      this.formData.periodStatus = status;
-      this.$emit("search", 4);
-    },
-    /**
-     *
-     * @param {int} status
-     * @remark 顶部定制按钮-根据审核状态类型点击快速搜索
-     */
-    topClassType(status) {
-      this.formData.classStatus = status;
-      this.$emit("search", 4);
-    },
     /**
      *
      * @param {int} status
@@ -1001,15 +812,6 @@ export default {
       this.formData.status = types;
       this.$emit("search", 3);
     },
-    /**
-     *
-     * @param {int} status
-     * @remark 顶部定制按钮-根据学时审核状态点击快速搜索
-     */
-    topHoursSearchsh(types) {
-      this.formData.periodStatus = types;
-      this.$emit("search", 2);
-    },
     /**
      * @remark 搜索
      */

src/utils/request.js

@@ -7,9 +7,9 @@ import { paramMate } from "@/utils/common";
 
 axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 // 创建axios实例
-// export const baseURL = process.env.VUE_APP_BASE_API
+export const baseURL = process.env.VUE_APP_BASE_API
 // export const baseURL = 'https://ptapi.gdzzkj.net/'
-export const baseURL = "http://192.168.1.24:7077/";
+// export const baseURL = "http://192.168.1.24:7077/";
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API;
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分

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

@@ -38,7 +38,7 @@
         </div>
       </template>
       <template slot="btn" slot-scope="props">
-        <el-button type="text" @click="openDialog(props.scope.row, 1)">
+        <el-button type="text" @click="openDialog([props.scope.row])">
           详情
         </el-button>
         <el-button
@@ -74,12 +74,6 @@
       :currentPage.sync="formData.pageNum"
       @search="search(3)"
     />
-    <!-- 订单详情 -->
-    <dislog-order-details
-      :orderSn="activeOrderInfo.orderSn"
-      :orderFrom="activeOrderInfo.orderFrom"
-      :dialogVisible.sync="orderDialogVisible"
-    />
     <dislog-set
       :dialogVisible.sync="examineDialogVisible"
       @search="search"
@@ -93,19 +87,14 @@ import dislogSet from "../../components/audit/dislogSet.vue";
 import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
-import dislogOrderDetails from "../../components/dislogOrderDetails.vue";
 import pictureList from "@/components/Comon/pictureList.vue";
 import { exportFn } from "@/utils/index.js";
 import {
   orderList,
   companyList,
-  orderExport,
-  tenantExport,
-  sellerExport,
   countOrderNum,
   commissionList,
   sellerPercentageList,
-  monthOrderList,
   commissionExport,
 } from "@/api/financed/index";
 
@@ -115,7 +104,6 @@ export default {
     searchBoxNew,
     tableList,
     pagination,
-    dislogOrderDetails,
     dislogSet,
     pictureList,
   },
@@ -187,18 +175,18 @@ export default {
         },
         {
           label: "下单企业",
-          prop: "tenantName",
+          prop: "purchaseOrg",
           hidden: true,
         },
         {
           label: "订单金额",
-          prop: "payMoney",
+          prop: "orderPrice",
           hidden: true,
           scope: "formatPrice",
         },
         {
           label: "税前佣金",
-          prop: "closeOrderMoney",
+          prop: "pretaxBrokerage",
           hidden: true,
           scope: "formatPrice",
         },
@@ -264,11 +252,7 @@ export default {
         },
       ],
       total: 0, //一共多少条
-      tipDialogVisible: false,
-      orderDialogVisible: false,
-      remarkDialogVisible: false,
       examineDialogVisible: false,
-      badBillDialogVisible: false,
       type: 1,
       activeOrderInfo: {},
       activeOrderInfoArray: [],
@@ -339,24 +323,10 @@ export default {
       }
       return a;
     },
-    exportSH() {
-      if (this.activeList.length === 0) {
-        this.$message.error("请勾选数据");
-        return;
-      }
-      this.openDialog(this.activeList);
-    },
     openDialog(data, type = 0) {
-      if (type === 1) {
-        this.activeOrderInfoArray = data;
-        for (let i = 0; i < this.activeOrderInfoArray.length; i++) {
-          this.activeOrderInfoArray[i].checkFrom = 4;
-        }
-      } else {
-        this.activeOrderInfo = data;
-        this.activeOrderInfo.checkFrom = 4;
-      }
-      this[["examine", "order"][type] + "DialogVisible"] = true;
+      data.forEach((e) => (e.checkFrom = 4));
+      this.activeOrderInfoArray = data;
+      this[["examine"][type] + "DialogVisible"] = true;
     },
     batchExport() {
       commissionExport(this.formData).then((res) => {

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

@@ -68,7 +68,7 @@
             props.scope.row.checkStatus !== 0 ||
             getRoles(props.scope.row.roleId)
           "
-          @click="openDialog([props.scope.row])"
+          @click="handelDetail(props.scope.row, true)"
         >
           审核
         </el-button>
@@ -83,6 +83,7 @@
     <!-- 订单详情 -->
     <dislog-order-details
       :appendToBody="true"
+      :ShowStatus="ShowStatus"
       :orderSn="activeOrderInfo.orderSn"
       :orderFrom="activeOrderInfo.orderFrom"
       :dialogVisible.sync="orderDialogVisible"
@@ -223,6 +224,7 @@ export default {
       tableData: [],
       total: 0,
       orderDialogVisible: false,
+      ShowStatus: false,
       activeOrderInfo: {},
       statisticsInfo: {},
     };
@@ -294,8 +296,9 @@ export default {
         return true;
       }
     },
-    handelDetail(data) {
+    handelDetail(data, ShowStatus) {
       this.activeOrderInfo = data;
+      this.ShowStatus = ShowStatus;
       this.orderDialogVisible = true;
     },
     batchAudit() {

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

@@ -6,7 +6,7 @@
       :redIcon="false"
       :formData="formData"
       :formList="formList"
-      @search="search(3)"
+      @search="search"
       @init="init"
     />
     <picture-list ref="pictureList" :list="statisticsList"></picture-list>
@@ -90,7 +90,7 @@
       :currentPage.sync="formData.pageNum"
       @search="search(3)"
     />
-    <!-- 订单详情 -->
+    <!-- 订单列表 -->
     <dislogOrderList
       :info="activeOrderInfo"
       :dialogVisible.sync="orderDialogVisible"
@@ -288,7 +288,9 @@ export default {
       return a;
     },
     openDialog(data, type = 0, isEdit) {
+      console.log("🚀 ~ file: index.vue:291 ~ openDialog ~ data:", data)
       if (type === 1) {
+        data.forEach((e) => (e.checkFrom = 2));
         this.activeOrderInfoArray = data;
       } else {
         data.isEdit = isEdit;

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

@@ -260,7 +260,7 @@ export default {
                 };
                 this.$api.orderbankpay(c).then((res) => {
                   this.isShow = false;
-                  this.$emit("search",3);
+                  this.$emit("search", 3);
                   this.$message({
                     type: "success",
                     message: "支付成功!",
@@ -292,7 +292,7 @@ export default {
               .updateBatchDivideByEditBo(array)
               .then((res) => {
                 this.isShow = false;
-                this.$emit("search",4);
+                this.$emit("search", 4);
               })
               .finally(() => {
                 this.disabledBtn = false;

src/views/financed/components/studentDetails.vue

@@ -384,6 +384,9 @@ export default {
   },
   created() {
     this.search("init");
+    if (!this.ShowStatus) {
+      this.dialogNavText1.choice = false;
+    }
   },
   methods: {
     exportData() {