From 0ceae5c33b8236786c0ac6d8d55f5ca942013dc7 Mon Sep 17 00:00:00 2001
From: zhouzy062 <zhouzy062@tydic.com>
Date: Thu, 21 Dec 2023 10:00:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newBuy/newDevices/newDevicesAccept.vue    |  9 ++-
 .../newBuy/newDevices/newDevicesArrival.vue   | 62 +++++++++----------
 .../src/views/store/tools/toolsSupplier.vue   |  8 +--
 sgzb-ui/src/views/store/tools/toolsType.vue   | 19 +++---
 4 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
index b30c8a56..e5542494 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
@@ -61,7 +61,7 @@
 
     <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="dictId" />
+      <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="机具类型名称" align="center" prop="machineTypeName" :show-overflow-tooltip="true" />
       <el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
       <el-table-column label="管理模式" align="center" prop="manageType" :show-overflow-tooltip="true" >
@@ -71,6 +71,7 @@
         </template>
       </el-table-column>
       <el-table-column label="机具厂家" align="center" prop="supplier" :show-overflow-tooltip="true" />
+      <el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true" />
       <el-table-column label="验收数量" align="center" prop="checkNum" :show-overflow-tooltip="true" />
       <el-table-column label="是否已具备设备自编号" align="center" prop="dictName" :show-overflow-tooltip="true" />
       <el-table-column label="验收图片" align="center" prop="checkUrl" :show-overflow-tooltip="true" />
@@ -154,7 +155,7 @@
             <!-- <el-table-column type="selection" width="50" align="center" /> -->
             <el-table-column label="序号" align="center" key="userId" prop="userId" />
             <el-table-column label="人员名称" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" />
-            <el-table-column label="所属机构" align="center" key="nickName" prop="nickName" :show-overflow-tooltip="true" />
+            <el-table-column label="所属机构" align="center" key="deptName" prop="deptName" :show-overflow-tooltip="true" />
             <el-table-column label="角色" align="center" key="deptName" prop="dept.deptName" :show-overflow-tooltip="true" />
             <el-table-column label="联系电话" align="center" key="phonenumber" prop="phonenumber" width="120" />
             <el-table-column
@@ -446,7 +447,9 @@ export default {
       // const dictId = row.dictId || this.ids
       // getType(dictId).then(response => {
         console.log(row)
-        this.form = row;
+        let rowData = row
+        rowData.checkNum = rowData.purchaseNum;
+        this.form = rowData;
         this.open = true;
         this.title = "验收";
       // });
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
index 04a916a4..86c8286c 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="24" class="mb8">
-      <el-col :span="4" style="text-align:center;"><h4>新购任务信息:</h4></el-col>
+      <!-- <el-col :span="4" style="text-align:center;"><h4>新购任务信息:</h4></el-col> -->
       <el-col :span="16">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" >
           <el-form-item label="机具类型" prop="equipmentId">
@@ -33,32 +33,10 @@
               />
             </el-select>
           </el-form-item> 
-    </el-form>
-
+        </el-form>  
       </el-col>
     </el-row>
-    
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-            v-hasPermi="['system:role:add']"
-        >保存</el-button>
-      </el-col>
-      <el-col :span="3">
-        <el-button
-            type="success"
-            plain
-            icon="el-icon-edit"
-            size="mini"
-            @click="jumpList"
-        >采购验收管理</el-button>
-      </el-col>
-      <el-form :model="dataForm" ref="dataForm" :rules="rules" size="small" :inline="true">
+    <el-form :model="dataForm" ref="dataForm" :rules="rules" size="small" :inline="true">
       <el-row>
         <el-form-item label="采购日期" prop="purchaseTime">
           <el-date-picker
@@ -87,7 +65,7 @@
             <el-option
               v-for="item in userList"
               :key="item.userId"
-              :label="item.nickName"
+              :label="item.userName"
               :value="item.userId"
               v-if="item.status !='1'"
             ></el-option>
@@ -103,7 +81,29 @@
           />
         </el-form-item>
       </el-row>
-    </el-form>
+      </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+        >保存</el-button>
+      </el-col>
+      <el-col :span="3">
+        <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            @click="jumpList"
+        >采购验收管理</el-button>
+      </el-col>
+
+
+      
       
       <!-- <el-col :span="1.5">
         <el-button
@@ -291,9 +291,9 @@ export default {
         arrivalTime: [
           { required: true, message: "到货日期不能为空", trigger: "blur" }
         ],
-        purchaser: [
-          { required: true, message: "采购员不能为空", trigger: "blur" }
-        ]
+        // purchaser: [
+        //   { required: true, message: "采购员不能为空", trigger: "blur" }
+        // ]
       }
     };
   },
@@ -308,7 +308,7 @@ export default {
   methods: {
      /** 查询用户列表--采购员 */
      getUserList() {
-      getUserByRoleList().then(response => {
+      getUserByRoleList({roleId:'104'}).then(response => {
         this.userList = response.data;
         }
       );
diff --git a/sgzb-ui/src/views/store/tools/toolsSupplier.vue b/sgzb-ui/src/views/store/tools/toolsSupplier.vue
index 6bcac367..3971d0ca 100644
--- a/sgzb-ui/src/views/store/tools/toolsSupplier.vue
+++ b/sgzb-ui/src/views/store/tools/toolsSupplier.vue
@@ -155,8 +155,8 @@
                 :on-success="handleAvatarSuccess"
                 :on-preview="handlePictureCardPreview"
                 :on-remove="handleRemove">
-                <!-- <img v-if="imageUrl" :src="'http://192.168.0.14:21624/system'+imageUrl" class="avatar"> -->
-                <img v-if="imageUrl" :src="'http://10.40.92.140:9201'+imageUrl" class="avatar">
+                <img v-if="imageUrl" :src="'http://192.168.0.14:21624/system'+imageUrl" style="width: 140px;height: 140px;" class="avatar">
+                <!-- <img v-if="imageUrl" :src="'http://10.40.92.140:9201'+imageUrl" style="width: 140px;height: 140px;" class="avatar"> -->
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
           <!-- <el-input v-model="form.businessLicense" placeholder="请上传营业执照" /> -->
@@ -354,8 +354,8 @@ export default {
     },
      //图片查看
      openImg(url){
-      // this.dialogImageUrl = "http://192.168.0.14:21624/system" + url;//线上
-      this.dialogImageUrl = "http://10.40.92.140:9201" + url;//本地
+      this.dialogImageUrl = "http://192.168.0.14:21624/system" + url;//线上
+      // this.dialogImageUrl = "http://10.40.92.140:9201" + url;//本地
       this.dialogVisible = true;
     },
     /** 删除按钮操作 */
diff --git a/sgzb-ui/src/views/store/tools/toolsType.vue b/sgzb-ui/src/views/store/tools/toolsType.vue
index 945ed654..e73938c9 100644
--- a/sgzb-ui/src/views/store/tools/toolsType.vue
+++ b/sgzb-ui/src/views/store/tools/toolsType.vue
@@ -98,7 +98,12 @@
           <el-table-column label="库管员" align="center" key="keeperUserName" prop="keeperUserName"
                            :show-overflow-tooltip="true"/>
           <el-table-column label="管理模式" align="center" key="manageType" prop="manageType"
-                           :show-overflow-tooltip="true"/>
+                           :show-overflow-tooltip="true">
+                           <template slot-scope="scope">
+                            <span v-if="scope.row.manageType=='0'">编码管理</span>
+                            <span v-if="scope.row.manageType=='1'">数量管理</span>
+                           </template>
+                          </el-table-column> 
 
 
 
@@ -112,8 +117,8 @@
           <el-table-column label="文档资料" align="center" key="documentName" prop="documentName"
                            :show-overflow-tooltip="true">
                             <template slot-scope="scope">
-                              <!-- <a :href="'http://192.168.0.14:21624/system'+scope.row.documentUrl" style="color: #02A7F0;" :download="scope.row.documentName">{{ scope.row.documentName }}</a> -->
-                              <a :href="'http://10.40.92.140:9201'+scope.row.documentUrl" style="color: #02A7F0;" :download="scope.row.documentName">{{ scope.row.documentName }}</a>
+                              <a :href="'http://192.168.0.14:21624/system'+scope.row.documentUrl" style="color: #02A7F0;" :download="scope.row.documentName">{{ scope.row.documentName }}</a>
+                              <!-- <a :href="'http://10.40.92.140:9201'+scope.row.documentUrl" style="color: #02A7F0;" :download="scope.row.documentName">{{ scope.row.documentName }}</a> -->
                             </template>
                           </el-table-column>
           <el-table-column label="资产属性" align="center" key="propName" prop="propName"
@@ -278,8 +283,8 @@
                 :on-success="handleAvatarSuccess"
                 :on-preview="handlePictureCardPreview"
                 :on-remove="handleRemove">
-                <!-- <img v-if="imageUrl" :src="'http://192.168.0.14:21624/system'+imageUrl" class="avatar"> -->
-                <img v-if="imageUrl" :src="'http://10.40.92.140:9201'+imageUrl" style="width: 100px;height: 100px;" class="avatar">
+                <img v-if="imageUrl" :src="'http://192.168.0.14:21624/system'+imageUrl" style="width: 140px;height: 140px;" class="avatar">
+                <!-- <img v-if="imageUrl" :src="'http://10.40.92.140:9201'+imageUrl" style="width: 140px;height: 140px;" class="avatar"> -->
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </el-form-item>
@@ -740,8 +745,8 @@ export default {
     },
     //图片查看
     openImg(url){
-      // this.dialogImageUrl = "http://192.168.0.14:21624/system" + url;//线上
-      this.dialogImageUrl = "http://10.40.92.140:9201" + url;//本地
+      this.dialogImageUrl = "http://192.168.0.14:21624/system" + url;//线上
+      // this.dialogImageUrl = "http://10.40.92.140:9201" + url;//本地
       this.dialogVisible = true;
     },
     //文件上传