From 88dd16d839198ea7e1604318f64b1b2130519b78 Mon Sep 17 00:00:00 2001
From: zhouzy062 <zhouzy062@tydic.com>
Date: Sun, 24 Dec 2023 17:54:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=89=8D=E7=AB=AF=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/api/store/warehousing.js          |  6 +++---
 sgzb-ui/src/views/base/comeAndGo/people.vue   |  1 +
 .../repairTest/repair/dialogThreeForm.vue     |  3 +--
 sgzb-ui/src/views/repairTest/repair/index.vue |  2 +-
 .../views/repairTest/testExamine/index.vue    |  8 ++++----
 .../newBuy/newDevices/newDevicesAccept.vue    |  4 ++--
 .../newBuy/newDevices/newDevicesCode.vue      |  6 +++---
 .../newBuy/newDevices/newDevicesList.vue      | 20 +++++++++----------
 sgzb-ui/src/views/store/tools/keeper.vue      |  3 ++-
 sgzb-ui/src/views/store/tools/repair.vue      |  3 ++-
 sgzb-ui/src/views/store/tools/toolsType.vue   |  5 +++--
 sgzb-ui/vue.config.js                         |  2 +-
 12 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/sgzb-ui/src/api/store/warehousing.js b/sgzb-ui/src/api/store/warehousing.js
index f1cabc18..ef49fedb 100644
--- a/sgzb-ui/src/api/store/warehousing.js
+++ b/sgzb-ui/src/api/store/warehousing.js
@@ -23,7 +23,7 @@ export function getTypeList(query) {
 //修试后入库--列表
 export function getRepairedList(data) {
     return request({
-      url: '/sgzb-material/RepairTestInput/getRepairedList',
+      url: '/material/RepairTestInput/getRepairedList',
       method: 'get',
       params: data
     })
@@ -32,7 +32,7 @@ export function getRepairedList(data) {
 //修试后入库--详情
 export function getRepairedDetailList(data) {
     return request({
-      url: '/sgzb-material//RepairTestInput/getRepairedDetailList',
+      url: '/material//RepairTestInput/getRepairedDetailList',
       method: 'get',
       params: data
     })
@@ -40,7 +40,7 @@ export function getRepairedDetailList(data) {
   //修试后入库--审核
 export function inputByType(data) {
     return request({
-      url: '/sgzb-material/RepairTestInput/inputByType',
+      url: '/material/RepairTestInput/inputByType',
       method: 'post',
       data: data
     })
diff --git a/sgzb-ui/src/views/base/comeAndGo/people.vue b/sgzb-ui/src/views/base/comeAndGo/people.vue
index def06025..e7ab182d 100644
--- a/sgzb-ui/src/views/base/comeAndGo/people.vue
+++ b/sgzb-ui/src/views/base/comeAndGo/people.vue
@@ -10,6 +10,7 @@
             clearable
             size="small"
             prefix-icon="el-icon-search"
+            @input="getUserList"
             style="margin-bottom: 20px"
           />
         </div>
diff --git a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
index 66c266be..4eee182e 100644
--- a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
+++ b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
@@ -286,7 +286,6 @@ export default {
             fileIds: this.fileIds.length > 0 ? this.fileIds : "",
             scrapNum: 1,
           }
-
           this.fullscreenLoading = true
           submitRepairApplyApi(params).then(res => {
             if (res.code == 200) {
@@ -320,7 +319,7 @@ export default {
             companyId: this.companyId,
             scrapReason: this.dynamicValidateFormTwo.scrapReason,
             scrapType: this.dynamicValidateFormTwo.scrapType,
-            fileIds: this.fileIds,
+            fileIds: this.fileIds.length > 0 ? this.fileIds : "",
             scrapNum: this.dynamicValidateFormTwo.scrapNum,
           }
           this.fullscreenLoading = true
diff --git a/sgzb-ui/src/views/repairTest/repair/index.vue b/sgzb-ui/src/views/repairTest/repair/index.vue
index 908315ea..a368dccd 100644
--- a/sgzb-ui/src/views/repairTest/repair/index.vue
+++ b/sgzb-ui/src/views/repairTest/repair/index.vue
@@ -123,7 +123,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          :disabled="!checkResultOne"
+          :disabled="!checkResultOne || multiple"
           type="primary"
           plain
           size="mini"
diff --git a/sgzb-ui/src/views/repairTest/testExamine/index.vue b/sgzb-ui/src/views/repairTest/testExamine/index.vue
index 16e367cb..f4f51670 100644
--- a/sgzb-ui/src/views/repairTest/testExamine/index.vue
+++ b/sgzb-ui/src/views/repairTest/testExamine/index.vue
@@ -126,8 +126,7 @@
           plain
           icon="el-icon-plus"
           size="mini"
-          :disabled="!checkResultOne"
-          v-hasPermi="['store:labelType:add']"
+          :disabled="!checkResultOne&&multiple"
           @click="checkClick"
           >批量审核</el-button
         >
@@ -139,7 +138,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['store:labelType:export']"
           >导出</el-button
         >
       </el-col>
@@ -358,7 +356,7 @@
         <el-table-column
           label="编码"
           align="center"
-          prop="dictName"
+          prop="maCode"
           :show-overflow-tooltip="true"
         />
         <el-table-column
@@ -675,6 +673,8 @@ export default {
       this.ids = selection.map(item => item.dictId)
       this.single = selection.length != 1
       this.multiple = !selection.length
+      console.log(this.single)
+      console.log(this.multiple)
     },
     handleSee(row, type) {
       this.dialogTitle = '查看'
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
index fb03ae7c..9659fa7d 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="名称" prop="keyWord">
+      <el-form-item label="关键字" prop="keyWord">
         <el-input
             v-model="queryParams.keyWord"
-            placeholder="请输入名称"
+            placeholder="请输入关键字"
             clearable
             style="width: 240px"
             @keyup.enter.native="handleQuery"
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
index 84d99b48..a3bba316 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="名称" prop="typeName">
+      <el-form-item label="关键字" prop="keyWord">
         <el-input
-            v-model="queryParams.typeName"
-            placeholder="请输入名称"
+            v-model="queryParams.keyWord"
+            placeholder="请输入关键字"
             clearable
             style="width: 240px"
             @keyup.enter.native="handleQuery"
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
index 43a300e6..30b081ec 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="名称" prop="dictName">
+      <el-form-item label="关键字" prop="keyWord">
         <el-input
-            v-model="queryParams.dictName"
-            placeholder="请输入名称"
+            v-model="queryParams.keyWord"
+            placeholder="请输入关键字"
             clearable
             style="width: 240px"
             @keyup.enter.native="handleQuery"
@@ -192,9 +192,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        status: undefined
+        name: undefined,
       },
       // 表单参数
       form: {},
@@ -231,11 +229,11 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        dictId: undefined,
-        dictName: undefined,
-        dictType: undefined,
-        status: "0",
-        remark: undefined
+        // dictId: undefined,
+        // dictName: undefined,
+        // dictType: undefined,
+        // status: "0",
+        // remark: undefined
       };
       this.resetForm("form");
     },
diff --git a/sgzb-ui/src/views/store/tools/keeper.vue b/sgzb-ui/src/views/store/tools/keeper.vue
index e8b6d220..1fe0340f 100644
--- a/sgzb-ui/src/views/store/tools/keeper.vue
+++ b/sgzb-ui/src/views/store/tools/keeper.vue
@@ -9,6 +9,7 @@
               placeholder="请输入人员名称"
               clearable
               size="small"
+              @input="getTree"
               prefix-icon="el-icon-search"
               style="margin-bottom: 20px"
           />
@@ -427,7 +428,7 @@ export default {
     },
     /** 查询下拉树结构 */
     getTree() {
-      getMaUserList().then(response => {
+      getMaUserList({userName:this.userName}).then(response => {
         this.treeOptions = this.handleTree(response.data, "userId"); 
       });
     },
diff --git a/sgzb-ui/src/views/store/tools/repair.vue b/sgzb-ui/src/views/store/tools/repair.vue
index d38e8344..1ce0924b 100644
--- a/sgzb-ui/src/views/store/tools/repair.vue
+++ b/sgzb-ui/src/views/store/tools/repair.vue
@@ -9,6 +9,7 @@
               placeholder="请输入人员名称"
               clearable
               size="small"
+              @input="getTree"
               prefix-icon="el-icon-search"
               style="margin-bottom: 20px"
           />
@@ -427,7 +428,7 @@ export default {
     },
     /** 查询下拉树结构 */
     getTree() {
-      getRepairerList().then(response => {
+      getRepairerList({userName:this.userName}).then(response => {
         this.treeOptions = this.handleTree(response.data, "userId"); 
       });
     },
diff --git a/sgzb-ui/src/views/store/tools/toolsType.vue b/sgzb-ui/src/views/store/tools/toolsType.vue
index 7f6b1470..8018412a 100644
--- a/sgzb-ui/src/views/store/tools/toolsType.vue
+++ b/sgzb-ui/src/views/store/tools/toolsType.vue
@@ -357,7 +357,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="调整后价格">
-              <el-input-number v-model="cform.leasePrice" style="width: 100%;" controls-position="right" :min="1" :max="1000"></el-input-number>
+              <el-input-number v-model="cform.leasePrice" style="width: 100%;" controls-position="right" :min="0"></el-input-number>
             </el-form-item>
           </el-col>
         </el-row>
@@ -692,7 +692,8 @@ export default {
       this.resetForm("cform");
       this.chosenTypeId = row.typeId;
       this.leasePrice = row.leasePrice;
-      this.cform.leasePrice = row.leasePrice;
+      // this.cform.leasePrice = row.leasePrice;
+      this.$set(this.cform,'leasePrice',row.leasePrice)
       this.configOpen = true;
       this.title = "租赁价格调整"
     },
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index f88c900d..a44425f8 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -42,7 +42,7 @@ module.exports = {
         // target: `http://10.40.92.102:8080`,//丁/
         // target: `http://10.40.92.126:8080`,//高
         // target: `http://10.40.92.104:8080`,//亮
-        // target: `http://10.40.92.209:8080`,//刘川
+        // target: `http://192.168.0.166:8080`,//刘川
 
         changeOrigin: true,
         pathRewrite: {