前端bug单修改

sgzb-ui/src/views/base/assetAttributeAllocation/index.vue

@@ -102,8 +102,13 @@
           <el-table-column label="原值" align="center" key="buyPrice" prop="dept.buyPrice"  :show-overflow-tooltip="true" />
           <el-table-column label="丢失赔偿价" align="center" key="payPrice" prop="payPrice"  width="120" />
           <el-table-column label="库管员" align="center" key="keeperUserName" prop="keeperUserName" width="120" />
-          <el-table-column label="图片" align="center" key="photoName" prop="photoName" width="120" />
+          <el-table-column label="图片" align="center" key="photoName" prop="photoName" width="120" >
-          <el-table-column label="文档资料" align="center" key="documentName" prop="documentName" width="120" />
+          <template slot-scope="scope">
+              <span @click="openImg(scope.row.photoUrl)" style="color: #02A7F0;"> {{ scope.row.photoName }} </span>
+            </template>
+          </el-table-column>
+          <el-table-column label="文档资料" align="center" key="documentName" prop="documentName" width="120"/>
+            
           <el-table-column label="资产属性" align="center" key="propName" prop="propName" width="120" />
           <el-table-column label="备注信息" align="center" key="remark" prop="remark" width="120" />
 
@@ -135,7 +140,9 @@
         />
       </el-col>
     </el-row>
-
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" height="650px" :src="dialogImageUrl" alt="">
+    </el-dialog>
   </div>
 </template>
 
@@ -221,34 +228,9 @@ export default {
         { key: 5, label: `状态`, visible: true },
         { key: 6, label: `创建时间`, visible: true }
       ],
-      // 表单校验
+      dialogImageUrl: '',
-      rules: {
+      dialogVisible: false,
-        userName: [
+      uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
-          { required: true, message: "用户名称不能为空", trigger: "blur" },
-          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
-        ],
-        nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
-        ],
-        password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
-        ],
-        email: [
-          {
-            type: "email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        phonenumber: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
-      }
     };
   },
   watch: {
@@ -364,6 +346,11 @@ export default {
       }
       
     },
+    //图片查看
+    openImg(url){
+      this.dialogImageUrl = this.uploadUrl + url;
+      this.dialogVisible = true;
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const typeIds = row.typeId;

sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" id="receiveApply">
+  <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="申请日期">
         <el-date-picker

sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" id="receiveManage">
+  <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="time">
         <el-date-picker

sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" id="receiveApply">
+  <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="申请日期">
         <el-date-picker

sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue

@@ -267,7 +267,7 @@ export default {
         //领料详情集合
         leaseApplyDetails:[]
       },
-      typeList:[{id:'0',name:'短期租赁'},{id:'1',name:'长期领用'}], //集合
+      typeList:[{id:'0',name:'工程租赁'},{id:'1',name:'长期领用'}], //集合
       leaseApplyDetails:[],
       leaseApplyInfoList:[],
       //领料详情单条模板

sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" id="receiveManage">
+  <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="time">
         <el-date-picker

sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue

@@ -149,7 +149,7 @@ export default {
   methods: {
     init() {
       let params = {
-        id: this.rowObj.id,
+        taskId: this.rowObj.taskId,
         agreementId: this.rowObj.agreementId
       }
       materialReturnNoteByApply(params).then(res => {

sgzb-ui/src/views/claimAndRefund/return/dialogFormExame.vue

@@ -149,7 +149,7 @@ export default {
   methods: {
     init() {
       let params = {
-        id: this.rowObj.id,
+        taskId: this.rowObj.taskId,
         agreementId: this.rowObj.agreementId
       }
       materialReturnNoteByExamine(params).then(res => {

sgzb-ui/src/views/claimAndRefund/return/returnApply.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" id="returnApply">
+  <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="关键字" prop="keyWord">
         <el-input maxlength="50" v-model="queryParams.keyWord" placeholder="请输入关键字" clearable style="width: 240px" />

sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" id="returnExamine">
+  <div class="app-container">
     <el-form
       :model="queryParams"
       ref="queryForm"

sgzb-ui/src/views/store/label/labelBindingHistory.vue

@@ -77,42 +77,19 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" type="index" />
-      <el-table-column
+      <el-table-column label="标签类型" align="center" prop="name" :show-overflow-tooltip="true" />
-        label="标签类型"
-        align="center"
-        prop="name"
-        :show-overflow-tooltip="true"
-      />
       <el-table-column label="标签编号" align="center" prop="labelCode">
         <template slot-scope="scope">
-          <span
+          <span style="color: blue; cursor: pointer" @click="labelUploadCode(scope.row)" >
-            style="color: blue; cursor: pointer"
+            {{ scope.row.labelCode }}
-            @click="labelUploadCode(scope.row)"
+          </span>
-          >
-            {{ scope.row.labelCode }}</span
-          >
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column label="物品种类" align="center" prop="kindName" :show-overflow-tooltip="true"/>
-        label="物品种类"
-        align="center"
-        prop="kindName"
-        :show-overflow-tooltip="true"
-      />
       <el-table-column label="物品名称" align="center" prop="modelName" />
-      <el-table-column
+      <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true"/>
-        label="规格型号"
-        align="center"
-        prop="typeName"
-        :show-overflow-tooltip="true"
-      />
       <el-table-column label="设备编码" align="center" prop="maCode" />
-      <el-table-column
+      <el-table-column label="绑定人员" align="center" prop="userName" :show-overflow-tooltip="true"/>
-        label="绑定人员"
-        align="center"
-        prop="userName"
-        :show-overflow-tooltip="true"
-      />
       <el-table-column label="操作人员" align="center" prop="userName" />
       <el-table-column label="绑定时间" align="center" prop="bindTime" />
       <el-table-column label="操作类型" align="center" prop="status">

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" id="newDevicesList">
+  <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="日期">
         <el-date-picker

sgzb-ui/vue.config.js

@@ -36,22 +36,22 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target:  `http://112.29.103.165:21626`,//线上环境-重庆
-        // target: `http://112.29.103.165:21624`,//线上环境-宁夏
+        // target: `http://112.29.103.165:21624`,//线上环境-宁夏 打包前放开数据大屏的路由
         // target: `http://192.168.0.14:21624`,//线上环境
         // target: `http://1.12.248.179:23028`,//线上环境-南网
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
         target: `http://10.40.92.12:8080`,//超
-        // target: `http://10.40.92.4:8080`,//韩
+        // target: `http://10.40.92.253:8080`,//韩
         // target: `http://10.40.92.209:8080`,//川/
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址;
-        //qrUrl:'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='
+        //qrUrl:'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='
         //2.打开view文件夹根目录dashboard.vue 更换大屏项目发布的跳转地址，打开大屏项目config/index.js更改请求地址，大屏打包node<16.0.0;
         //3.只有南网项目产线gl发布打包时候需要注意：
-        //  将 assetsDir:'static' 改为 assetsDir:'gl/static',还有env.development中的VUE_APP_BASE_API改为'/gl/dev-api';登录跳转地址从/login换成/gl/;
+        //  将 assetsDir:'static' 改为 assetsDir:'gl/static',还有env.development和env.production中的VUE_APP_BASE_API改为'/gl/dev-api';登录跳转地址从/login换成/gl/;
         //4. 重庆环境的时候需要将新增领料申请跳转地址改为claimAndRefund/receive/receiveApplyAddByCq
         //******** 注意事项  ********* */