From a9a42f4421dee459a3839eb6a9582670eb80366a Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 12 Jun 2024 16:53:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=86=E6=96=99=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=A1=B5=E9=9D=A2=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picking/auditing/component/home1.vue      | 28 ++++++++
 .../claimAndreturn/picking/auditing/index.vue | 18 ++---
 sgzb-ui/src/views/newLogin.vue                |  2 +-
 .../forecastWaste/listing/index.vue           |  8 +--
 .../toolsAcceptance/component/home.vue        | 70 ++++++++++---------
 sgzb-ui/vue.config.js                         |  4 +-
 6 files changed, 80 insertions(+), 50 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
index e0472116..98ca6371 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
@@ -55,6 +55,23 @@
                     </el-option>
                 </el-select>
             </el-form-item>
+            <el-form-item label="审核状态" prop="taskStatus">
+                <el-select
+                    v-model="queryParams.taskStatus"
+                    filterable
+                    clearable
+                    style="width: 240px"
+                    placeholder="请选择"
+                >
+                    <el-option
+                        v-for="item in taskStatusList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
 
             <el-form-item label="申请日期" prop="time">
                 <el-date-picker
@@ -493,6 +510,7 @@ export default {
                 dictName: undefined,
                 dictType: undefined,
                 status: undefined,
+                taskStatus: '',
             },
             user: {},
             unitList: [],
@@ -542,6 +560,15 @@ export default {
 
             // 当前用户所属部门Id
             currentDeptId: parseInt(sessionStorage.getItem('deptId')),
+
+            taskStatusList: [
+                { name: '待分公司审核', id: 30 },
+                { name: '待分管部门审核', id: 31 },
+                { name: '待内部审核', id: 32 },
+                { name: '待出库', id: 33 },
+                { name: '出库进行中', id: 34 },
+                { name: '已完成', id: 35 },
+            ],
         }
     },
     created() {
@@ -567,6 +594,7 @@ export default {
             const params = {
                 unitId: this.queryParams.unitId,
                 projectId: this.queryParams.proId,
+                taskStatus: this.queryParams.taskStatus,
                 keyWord: this.queryParams.keyWord,
                 startTime: this.queryParams.time && this.queryParams.time[0],
                 endTime: this.queryParams.time && this.queryParams.time[1],
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue
index e01682c3..f6557136 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue
@@ -6,14 +6,16 @@
             :pageContent="pageContent"
             @goBack="goBack"
         />
-        <component
-            :is="isShowComponent"
-            :isView="isView"
-            :auditingTaskId="auditingTaskId"
-            @pickingView="pickingView"
-            @pickingAuditing="pickingAuditing"
-            @goBackPage="goBack"
-        />
+        <keep-alive include="Home">
+            <component
+                :is="isShowComponent"
+                :isView="isView"
+                :auditingTaskId="auditingTaskId"
+                @pickingView="pickingView"
+                @pickingAuditing="pickingAuditing"
+                @goBackPage="goBack"
+            />
+        </keep-alive>
     </div>
 </template>
 
diff --git a/sgzb-ui/src/views/newLogin.vue b/sgzb-ui/src/views/newLogin.vue
index 7770b14e..cdc346c6 100644
--- a/sgzb-ui/src/views/newLogin.vue
+++ b/sgzb-ui/src/views/newLogin.vue
@@ -655,7 +655,7 @@ export default {
 }
 
 /* 解决验证码输入框与密码输入框对齐问题 */
-.code-container .el-form-item__content {
+::v-deep .code-container .el-form-item__content {
     display: flex;
 }
 
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
index c0da2aa4..bed1139c 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
@@ -113,11 +113,7 @@
                             :config="dialogConfig"
                         >
                             <template slot="imgPreview">
-                                <ImagePreview
-                                    :src="``"
-                                    :width="`30px`"
-                                    :height="`30px`"
-                                />
+                                <ScrapImg />
                             </template> </TableModel
                     ></template>
 
@@ -151,6 +147,7 @@ import SelDepart from '../../component/selDepart.vue'
 import ScrapSource from '../../component/scrapSource.vue'
 import AuditingReturn from '../auditingReturn/index.vue' // 退料驳回页面
 import AuditingDetails from '../../component/auditingDetails.vue'
+import ScrapImg from '../../component/scrapImg.vue'
 import {
     getPreScrapListApi,
     getDialogListApi,
@@ -166,6 +163,7 @@ export default {
         ScrapSource,
         AuditingReturn,
         AuditingDetails,
+        ScrapImg,
     },
     data() {
         return {
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
index 26e95a43..3dfe34cf 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
@@ -38,22 +38,22 @@
                 </el-select>
             </el-form-item>
 
-          <el-form-item label="采购状态" prop="taskState">
-            <el-select
-              v-model="queryParams.taskState"
-              placeholder="请选择采购状态"
-              clearable
-              filterable
-              style="width: 240px"
-            >
-              <el-option
-                v-for="statusItem in statusList"
-                :key="statusItem.taskState"
-                :label="statusItem.label"
-                :value="statusItem.taskState"
-              />
-            </el-select>
-          </el-form-item>
+            <el-form-item label="采购状态" prop="taskState">
+                <el-select
+                    v-model="queryParams.taskState"
+                    placeholder="请选择采购状态"
+                    clearable
+                    filterable
+                    style="width: 240px"
+                >
+                    <el-option
+                        v-for="statusItem in statusList"
+                        :key="statusItem.taskState"
+                        :label="statusItem.label"
+                        :value="statusItem.taskState"
+                    />
+                </el-select>
+            </el-form-item>
 
             <el-form-item label="关键字" prop="keyWord">
                 <el-input
@@ -207,7 +207,7 @@
                         type="text"
                         icon="el-icon-edit"
                         v-if="
-                           (scope.row.purchasingStatus == '验收合格') &&
+                            scope.row.purchasingStatus == '验收合格' &&
                             scope.row.manageType != '1'
                         "
                         @click="handleCode(scope.row)"
@@ -220,7 +220,8 @@
                         icon="el-icon-edit"
                         v-if="
                             scope.row.purchasingStatus == '验收合格' ||
-                            scope.row.purchasingStatus == '综合服务中心审核中' ||
+                            scope.row.purchasingStatus ==
+                                '综合服务中心审核中' ||
                             scope.row.purchasingStatus == '入库审核中' ||
                             scope.row.purchasingStatus == '入库审核未通过' ||
                             scope.row.purchasingStatus == '部分已入库' ||
@@ -231,7 +232,7 @@
                     >
                     <el-button
                         size="mini"
-                        type="success"
+                        type="text"
                         icon="el-icon-edit"
                         v-if="scope.row.purchasingStatus == '验收合格'"
                         @click="handleSubmit(scope.row)"
@@ -245,7 +246,8 @@
                         v-if="
                             scope.row.purchasingStatus == '待通知' ||
                             scope.row.purchasingStatus == '验收未通过' ||
-                            scope.row.purchasingStatus == '综合服务中心未通过' ||
+                            scope.row.purchasingStatus ==
+                                '综合服务中心未通过' ||
                             scope.row.purchasingStatus == '入库审核未通过'
                         "
                         @click="handleDelete(scope.row)"
@@ -506,20 +508,20 @@ export default {
             //搜索下拉数据
             typesList: [],
             modelList: [],
-          // 采购状态下拉数据
-          statusList: [
-            { label: '全部', taskState: null },
-            { label: '待通知', taskState: 24 },
-            { label: '待验收', taskState: 25 },
-            { label: '验收合格', taskState: 26 },
-            { label: '验收未通过', taskState: 27 },
-            { label: '综合服务中心审核中', taskState: 122 },
-            { label: '综合服务中心未通过', taskState: 106 },
-            { label: '入库审核中', taskState: 105 },
-            { label: '入库审核未通过', taskState: 107 },
-            { label: '部分已入库', taskState: 123 },
-            { label: '已全部入库', taskState: 28 }
-          ],
+            // 采购状态下拉数据
+            statusList: [
+                { label: '全部', taskState: null },
+                { label: '待通知', taskState: 24 },
+                { label: '待验收', taskState: 25 },
+                { label: '验收合格', taskState: 26 },
+                { label: '验收未通过', taskState: 27 },
+                { label: '综合服务中心审核中', taskState: 122 },
+                { label: '综合服务中心未通过', taskState: 106 },
+                { label: '入库审核中', taskState: 105 },
+                { label: '入库审核未通过', taskState: 107 },
+                { label: '部分已入库', taskState: 123 },
+                { label: '已全部入库', taskState: 28 },
+            ],
             // 字典表格数据
             typeList: [],
             // 弹出层标题
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index d5357f38..3a63933c 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -43,11 +43,11 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        // target: `http://10.40.92.50:28080`, //超
+        target: `http://10.40.92.51:28080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
         // target: `http://10.40.92.148:28080`, //帅
-        target: `http://10.40.92.253:28080`, //福
+        // target: `http://10.40.92.253:28080`, //福
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;