From 2c7bead20866512f89b5ff18f97b1001a97828bf Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 28 Mar 2023 14:26:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E5=AE=A1=E6=A0=B8=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/busLocalType.js                 |  7 ---
 .../basic/busType/bussinessTypeModify.vue     | 25 ++++++---
 src/views/basic/business/stockOrder.vue       |  3 +-
 src/views/inout/DialogCreateOrder.vue         |  2 +-
 src/views/inout/IoSupSearchOrder.vue          |  3 +-
 src/views/inout/IoSupSecAuditOrder.vue        |  4 +-
 src/views/purchase/cert/supCertAudit.vue      | 56 +++++++++++++++----
 7 files changed, 67 insertions(+), 33 deletions(-)

diff --git a/src/api/basic/busLocalType.js b/src/api/basic/busLocalType.js
index f593f6c..93ff8fe 100644
--- a/src/api/basic/busLocalType.js
+++ b/src/api/basic/busLocalType.js
@@ -16,13 +16,6 @@ export function getLocalJoinBusType(query) {
     });
 }
 
-export function getLocalJoinByUser(query) {
-    return axios({
-        url: "/udiwms/localBusType/filterJoinByUser",
-        method: "get",
-        params: query
-    });
-}
 
 export function getLocalJoinNoUse(query) {
     return axios({
diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 9121f92..6a3babe 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -64,7 +64,7 @@
         </el-col>
         <el-col :span="11">
           <el-form-item label="内部单据自动平衡" prop="supplementOrderType">
-            <el-select :disabled="inputQuery.corpType !=3  || inputQuery.inStock!= true"
+            <el-select :disabled="inputQuery.corpType !=3  || inputQuery.inStock!= true  || inputQuery.actionType != 1"
                        size="small"
                        style="width: 90%"
                        v-model="inputQuery.supplementOrderType"
@@ -86,7 +86,8 @@
       <el-row type="flex">
         <el-col :span="11">
           <el-form-item label="允许手动输入客户信息" prop="genUnit">
-            <el-select v-model="inputQuery.genUnit" :disabled="inputQuery.corpType != 1" style="width: 90%"
+            <el-select v-model="inputQuery.genUnit"
+                       :disabled="inputQuery.corpType != 1  || inputQuery.mainAction!='WareHouseOut'" style="width: 90%"
                        placeholder="是否允许" clearable
             >
               <el-option label="允许" :value="true"></el-option>
@@ -96,14 +97,14 @@
         </el-col>
         <!--   :disabled="inputQuery.mainAction!='WareHouseIn' || inputQuery.corpType!=2 "-->
         <el-col :span="11" type="flex">
-          <el-form-item label="采购方式" prop="actionType">
+          <el-form-item label="库存方式" prop="actionType">
             <el-select v-model="inputQuery.actionType"
                        size="small"
                        style="width: 90%"
                        clearable
                        placeholder="请选择入库方式">
               <el-option label="无" :value="0"></el-option>
-              <el-option label="带票" :value="1"></el-option>
+              <el-option label="入账" :value="1"></el-option>
               <el-option label="预验收" :value="2"></el-option>
               <el-option label="寄售" :value="3"></el-option>
             </el-select>
@@ -112,12 +113,13 @@
       </el-row>
       <el-row type="flex">
         <el-col :span="11">
-          <el-form-item label="允许供应商使用" prop="prefix">
+          <el-form-item label="供应商使用权限" prop="prefix">
             <el-select v-model="inputQuery.spUse"
                        :disabled=" inputQuery.corpType!=2 "
                        style="width: 90%" placeholder="是否允许" clearable>
-              <el-option label="是" :value="true"></el-option>
-              <el-option label="否" :value="false"></el-option>
+              <el-option label="无" :value="0"></el-option>
+              <el-option label="可查看" :value="1"></el-option>
+              <el-option label="增删改查" :value="2"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -126,7 +128,7 @@
           <el-form-item label="预验收使用结束退回" prop="preInBack">
             <el-select v-model="inputQuery.preInBack"
                        :disabled="inputQuery.actionType != 2 || inputQuery.mainAction!='WareHouseIn' ||
-                                inputQuery.corpType != 2  "
+                                inputQuery.corpType != 2 || inputQuery.inStock==false "
 
                        style="width: 90%"
                        placeholder="是否退回" clearable
@@ -1155,9 +1157,14 @@ export default {
 
       if (this.inputQuery.corpType != 2) {    //往来类型非供应商时，采购方式未无
         this.inputQuery.actionType = 0;
-        this.inputQuery.spUse = false;
+        this.inputQuery.spUse = null;
       }
 
+      // if (this.inputQuery.corpType == 3) {//往来类型为内部科室
+      //   this.inputQuery.inStock = null;
+      //
+      // }
+
     },
 
     //获取单据类型
diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 744974d..5770792 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -185,11 +185,12 @@ import stockQRCodeExport from "./stockQRCodeExport";
 import draggable from "vuedraggable";
 import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "@/api/itextpdf/itextpdf";
 import store from "@/store";
-import {getLocalJoinBusType, getLocalJoinByUser} from "@/api/basic/busLocalType";
+import {getLocalJoinBusType} from "@/api/basic/busLocalType";
 import {filterAll, filterAllByUser} from "@/api/system/invWarehouse";
 import {filterSubByInv, findInvByUser} from '@/api/system/invSubWarehouse'
 import {convertDate} from "@/utils/date"
 import {filterOrder} from "@/api/inout/order";
+import {getLocalJoinByUser} from "@/api/basic/busType";
 
 export default {
   name: "stockOrder",
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 03108a3..a0daf31 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -387,7 +387,7 @@ export default {
     getBusTypeByInv() {
       let query = {
         code: this.orderFormData.invCode,
-        vueType: "supDelivery",
+        spUse: 2,
       };
       getLocalJoinByUser(query)
         .then((response) => {
diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue
index 5efd602..d2f70fd 100644
--- a/src/views/inout/IoSupSearchOrder.vue
+++ b/src/views/inout/IoSupSearchOrder.vue
@@ -597,7 +597,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
-        spUse: true,
+        viewType: 'supInout',
       };
       getLocalJoinByUser(query)
         .then((response) => {
@@ -637,6 +637,7 @@ export default {
       this.loading = true;
       this.currentRow = {billNo: ""};
       this.clearDetailList();
+      this.filterQuery.vueType = 'supInout';
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/inout/IoSupSecAuditOrder.vue b/src/views/inout/IoSupSecAuditOrder.vue
index b414af7..35d428f 100644
--- a/src/views/inout/IoSupSecAuditOrder.vue
+++ b/src/views/inout/IoSupSecAuditOrder.vue
@@ -635,7 +635,7 @@ export default {
       let query = {
         code: this.filterQuery.invCode,
         enabled: true,
-        vueType: "supDelivery",
+        vueType: "supDelAudit",
       };
       getLocalJoinByUser(query)
         .then((response) => {
@@ -675,7 +675,7 @@ export default {
       this.loading = true;
       this.currentRow = {billNo: ""};
       this.clearDetailList();
-      this.filterQuery.vueType = "supDelivery";
+      this.filterQuery.vueType = "supDelAudit";
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue
index 0dd8848..f954860 100644
--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@@ -31,17 +31,41 @@
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
                 @row-click="supCompanyClick">
         <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="配送企业名称" prop="companyName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="统一社会信用号" prop="creditNum"></el-table-column>
-        <el-table-column label="所属地区" prop="area"></el-table-column>
-        <el-table-column label="详细地址" prop="detailAddr" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="生产企业状态" prop="auditStatus" width="120">
+        <el-table-column label="配送企业名称" prop="companyName" width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column label="统一社会信用号" prop="creditNum" width="160"></el-table-column>
+        <el-table-column label="所属地区" prop="area" width="180"></el-table-column>
+        <el-table-column label="详细地址" prop="detailAddr" :show-overflow-tooltip="true" width="180"></el-table-column>
+        <el-table-column label="生产企业证书" prop="auditStatus" width="120">
           <template slot-scope="scope">
-            <span v-if="scope.row.failCout==0 && scope.row.passCout==0">未提交</span>
-            <span v-if="scope.row.failCout>0">未审核</span>
-            <span v-if="scope.row.failCout==0 && scope.row.passCout>0">已审核</span>
+
+            <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
+              未添加证书
+            </el-tag>
+            <el-tag type="warning" v-if="scope.row.failCout>0">
+              未全部审核
+            </el-tag>
+            <el-tag type="success" v-if="scope.row.failCout==0 && scope.row.passCout>0">
+              已全部审核
+            </el-tag>
           </template>
         </el-table-column>
+
+        <el-table-column label="配送产品证书" prop="auditStatus" width="120">
+          <template slot-scope="scope">
+            <el-tag type="danger" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout==0">
+              未添加证书
+            </el-tag>
+            <el-tag type="warning" v-if="scope.row.productFailCout>0">
+              未全部审核
+            </el-tag>
+            <el-tag type="success" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout>0">
+              已全部审核
+            </el-tag>
+
+
+          </template>
+        </el-table-column>
+
         <el-table-column label="审核状态" prop="auditStatus" width="120">
           <template slot-scope="scope">
             <el-tag :type="(scope.row.auditStatus) | statusFilterType">
@@ -138,11 +162,19 @@
         <el-table-column label="所在地区" prop="placeArea"></el-table-column>
         <el-table-column label="所在地址" prop="placeAddress" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="所属供应商" prop="supName" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="配送产品状态" prop="auditStatus" width="120">
+        <el-table-column label="配送产品证书" prop="auditStatus" width="120">
           <template slot-scope="scope">
-            <span v-if="scope.row.failCout==0 && scope.row.passCout==0">未提交</span>
-            <span v-if="scope.row.failCout>0">未审核</span>
-            <span v-if="scope.row.failCout==0 && scope.row.passCout>0">已审核</span>
+
+            <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
+              未添加证书
+            </el-tag>
+            <el-tag type="warning" v-if="scope.row.failCout>0">
+              未全部审核
+            </el-tag>
+            <el-tag type="success" v-if="scope.row.failCout==0 && scope.row.passCout>0">
+              已全部审核
+            </el-tag>
+
           </template>
         </el-table-column>
         <el-table-column label="审核状态" prop="auditStatus" width="120">