测试问题前端修改

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

@@ -96,7 +96,17 @@
       <el-table-column label="序号" align="center" type="index"  width="60"/>
       <el-table-column label="协议编号" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
       <el-table-column label="合同编号" align="center" prop="contractCode" :show-overflow-tooltip="true" />
-      <el-table-column label="附件图片" align="center" prop="fileName" :show-overflow-tooltip="true" />
+      <el-table-column label="协议类型" align="center" prop="protocol" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span v-if="scope.row.protocol==1">内部单位</span>
+          <span v-if="scope.row.protocol==2">外部单位</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="附件图片" align="center" prop="fileName" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <div v-for="(item,index) in scope.row.imgUrlList" :key="index" @click="openImg(item)" style="color: #02A7F0;cursor: pointer;">{{scope.row.imgNameList[index]}}</div>
+        </template>
+      </el-table-column>
       <el-table-column label="签订日期" align="center" prop="signTime" :show-overflow-tooltip="true" />
       <el-table-column label="往来单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
       <el-table-column label="工程名称" align="center" prop="projectName" :show-overflow-tooltip="true" />
@@ -223,7 +233,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="联系方式" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系方式" />
+              <el-input v-model="form.phone" placeholder="请输入联系方式" maxlength="11"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -244,6 +254,7 @@
                     list-type="picture-card"
                     accept=".png,.jpg,.jpeg"
                     :on-success="handleAvatarSuccess"
+                    :class="{ disabled: uploadDisabled }"
                     :on-preview="handlePictureCardPreview"
                     :on-remove="handleRemove">
                     <i  class="el-icon-plus avatar-uploader-icon"></i>
@@ -354,6 +365,12 @@ export default {
       deptName: undefined,
     };
   },
+  computed: {
+    //图片上传1张后，隐藏上传框
+    uploadDisabled() {
+      return this.checkUrlList.length > 4
+    }
+  },
   created() {
     this.getList();
     this.getUnitList();
@@ -378,6 +395,12 @@ export default {
       this.loading = true;
       getAgreementList(this.queryParams).then(response => {
           this.agreementList = response.rows;
+          this.agreementList.forEach(item=>{
+          if(item.fileUrl){
+            item.imgUrlList = item.fileUrl.split(',')
+            item.imgNameList = item.fileName.split(',')
+          }
+        })
           this.total = response.total;
           this.loading = false;
         }
@@ -443,13 +466,13 @@ export default {
       })
     },
     handleAvatarSuccess(res,file) {
-      console.log("success")
+
-      },
+    },
-    handleRemove(file, fileList) {
+    handleRemove(file,fileList) {
       let sum = 0;
       this.checkUrlNameList.forEach((item,index) => { if(item == file.name){ sum = index } }); 
       this.checkUrlNameList.splice(sum, 1);
-      this.checkUrlList.splice(sum, 1); 
+      this.checkUrlList.splice(sum, 1);
     },
     //图片点击查看
     handlePictureCardPreview(file) {
@@ -480,7 +503,7 @@ export default {
         this.fileList = []
         this.checkUrlList = []
         this.checkUrlNameList = []
-        if(response.data.fileUrl!=''){
+        if(response.data.fileUrl&&response.data.fileUrl!=''){
           let urlArr = response.data.fileUrl.split(',')
           let nameArr =  response.data.fileName.split(',')
           for(let i=0;i<urlArr.length;i++){
@@ -547,4 +570,10 @@ export default {
   width: 60px !important;
   margin-bottom: 10px;
 }
+//隐藏图片上传框的css
+::v-deep.disabled {
+  .el-upload--picture-card {
+    display: none;
+  }
+}
 </style>

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

@@ -577,7 +577,7 @@ export default {
             if(res.code == 200){
               this.$message({
                 type:'success',
-                message: '申请成功'
+                message: res.msg
               }) 
               this.$tab.closeOpenPage({ path: "/claimAndRefund/receive/receiveApply"});
             }

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

@@ -93,7 +93,12 @@
       <el-table-column label="申请时间" align="center" prop="createTimes" :show-overflow-tooltip="true" />
       <el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" />
 <!--      <el-table-column label="审批结果 " align="center" prop="dictName" :show-overflow-tooltip="true" />-->
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="备注" align="center" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.leaseApplyInfoList[0].remark }}</span>
+
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="left" width="250" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button

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

@@ -265,6 +265,8 @@ export default {
         agreementCode: null, //协议code
         companyId:'', //登录信息中取
         createBy: '', //用户名
+        estimateLeaseTime:'',
+        leaseType:'',
         taskType: 29,
         taskStatus: 31,
         //领料人信息

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

@@ -100,7 +100,12 @@
       <el-table-column label="申请时间" align="center" prop="createTimes" :show-overflow-tooltip="true" />
       <el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" />
 <!--      <el-table-column label="审批结果 " align="center" prop="dictName" :show-overflow-tooltip="true" />-->
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="备注" align="center" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.leaseApplyInfoList[0].remark }}</span>
+
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="left" width="250" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button

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

@@ -752,7 +752,7 @@ export default {
 
       let params = {
         ids: this.rowObj.id,
-        returnDetailList:this.loadingList
+        backApplyDetails:this.loadingList
       }
       // console.log(params)
       ApiBackApplyAudit(params).then(res => {

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

@@ -155,25 +155,7 @@
         <el-table-column label="联系电话" align="center" prop="phone"  :show-overflow-tooltip="true"/>
         <el-table-column label="申请时间" align="center" prop="backTime"  :show-overflow-tooltip="true"/>
         <el-table-column label="协议号" align="center" prop="agreementCode"  :show-overflow-tooltip="true"/>
-        <el-table-column label="退料状态" align="center"  :show-overflow-tooltip="true">
+        <el-table-column label="退料状态" align="center" prop="taskName" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-          <!-- 状态 37-待审核 38-已审核 -->
-        <el-button type="text" v-if="scope.row.taskStatus == '37'">
-          待审核
-        </el-button>
-        <el-button type="text" style="color: #67c23a" v-if="scope.row.taskStatus == '38'">
-            已审核
-        </el-button>
-        <el-button type="text" v-if="scope.row.taskStatus == '39'">
-          退料核查
-        </el-button>
-        <el-button type="text" style="color: #67c23a" v-if="scope.row.taskStatus == '40'">
-          退料完成
-        </el-button>
-        <el-button type="text" style="color: #67c23a" v-if="scope.row.taskStatus == '101'">
-          退料驳回
-        </el-button>
-        </template>
         </el-table-column>
         
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
@@ -181,7 +163,7 @@
             <el-button size="mini" plain icon="el-icon-zoom-in" @click="handleSee(scope.row, 'see')">
                 查看
             </el-button>
-            <el-button size="mini" type="warning" @click="handleReturn(scope.row, 'see')">
+            <el-button size="mini" type="warning" @click="handleReturn(scope.row, 'see')" v-if="scope.row.taskStatus!='40'">
                 退料
             </el-button>
             <el-button size="mini" type="primary" @click="handlePrint(scope.row)">
@@ -399,9 +381,9 @@
       },
       /** 导出按钮操作 */
       handleExport() {
-        //  this.download('material/backApply/exportExamine', {
+         this.download('base/backReceive/export', {
-        //   ...this.queryParams
+          ...this.queryParams
-        // }, `退料审核单_${new Date().getTime()}.xlsx`)
+        }, `退料接收_${new Date().getTime()}.xlsx`)
       },
 
   

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

@@ -68,7 +68,7 @@
        
         <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
         <el-table-column label="规格型号" align="center" prop="typeCode" :show-overflow-tooltip="true" />
-        <el-table-column label="审批数量" align="center" prop="preNum" :show-overflow-tooltip="true"/>
+        <el-table-column label="申请数量" align="center" prop="preNum" :show-overflow-tooltip="true"/>
         <el-table-column label="退料数量" align="center" prop="num" :show-overflow-tooltip="true" />
         <!-- <el-table-column label="维修数量" align="center" prop="" :show-overflow-tooltip="true"/>
         <el-table-column label="预报废数量" align="center" prop="" :show-overflow-tooltip="true"/> -->

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

@@ -136,6 +136,7 @@
                 :show-file-list="true"
                 list-type="picture-card"
                 accept=".png,.jpg,.jpeg"
+                :class="{ disabled: uploadDisabled }"
                 :on-preview="handlePictureCardPreview"
                 :on-remove="handleRemove">
                 <!-- <img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar"> -->
@@ -166,6 +167,7 @@
                 list-type="picture-card"
                 accept=".png,.jpg,.jpeg"
                 :on-preview="handlePictureCardPreview"
+                :class="{ disabled: uploadDisabled }"
                 :on-remove="handleRemove">
                 <!-- <img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar"> -->
                 <i class="el-icon-plus avatar-uploader-icon"></i>
@@ -360,6 +362,12 @@ export default {
       deptName: undefined,
     };
   },
+  computed: {
+    //图片上传1张后，隐藏上传框
+    uploadDisabled() {
+      return this.checkUrlList.length > 4
+    }
+  },
   mounted() {
     const taskId = this.$route.query && this.$route.query.taskId;
     this.taskId = taskId;
@@ -385,12 +393,9 @@ export default {
         this.equipmentList.forEach(item=>{
           if(item.checkUrl){
             item.imgUrlList = item.checkUrl.split(',')
-          item.imgNameList = item.checkUrlName.split(',')
+            item.imgNameList = item.checkUrlName.split(',')
           }
-          // console.log(item.checkUrl)
-          
         })
-
         this.loading = false;
       })
     },
@@ -720,4 +725,10 @@ export default {
   width: 60px !important;
   margin-bottom: 10px;
 }
+//隐藏图片上传框的css
+::v-deep.disabled {
+  .el-upload--picture-card {
+    display: none;
+  }
+}
 </style>

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

@@ -104,12 +104,12 @@
           <el-input v-model="form.typeId" disabled  v-show="false"/>
           <el-col :span="7">
             <el-form-item label="编码前缀" prop="exCode">
-              <el-input v-model="form.exCode" />
+              <el-input v-model="form.exCode"/>
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="后缀范围">
-              <div style="display: flex;"><el-input v-model="form.str" placeholder="0001"></el-input> - <el-input v-model="form.str1" placeholder="0005"></el-input></div>
+              <div style="display: flex;"><el-input v-model="form.str" placeholder="0001" maxlength="4"></el-input> - <el-input v-model="form.str1" placeholder="0005" maxlength="4"></el-input></div>
                
             </el-form-item>
           </el-col>
@@ -412,16 +412,11 @@ export default {
 
     /** 提交按钮 */
     submitForm: function() {
-      console.log(this.codeList)
+      // console.log(this.codeList)
-
+      if(this.hasDuplicateField(this.codeList, 'assetsCode')){
-      // for(let i = 0; i < this.codeListt; i++) {
+        this.$modal.msgError("固定资产编码绑定失败,存在重复编码，请重新输入");
-      //   if(this.codeList[i].maCode==''){
+        return false
-      //     this.$modal.msgError("设备编码不能为空");
+      }
-      //     return false
-      //   }
-      // }
-
-
       if(this.codeList.length==0){
         this.$modal.msgError("无新增编码绑定");
       }else{
@@ -437,9 +432,17 @@ export default {
           }
         });
       }
-      
+    },
-      
+    hasDuplicateField(array, field) {
-      
+      const map = {};
+      for (let i = 0; i < array.length; i++) {
+        const value = array[i][field];
+        if (map[value]) {
+          return true;
+        }
+        map[value] = true;
+      }
+      return false;
     },
     getdetailmaCodeList(data){
       console.log(data)

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

@@ -161,7 +161,7 @@
             <span v-if="scope.row.manageType=='1'">数量管理</span>
           </template>
         </el-table-column>
-        <el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" />
+        <!-- <el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
         <el-table-column label="状态" align="center" prop="status">
           <template slot-scope="scope">
             <span v-if="scope.row.status=='0'">未入库</span>

sgzb-ui/src/views/store/shelves/shelvesConfig.vue

@@ -30,9 +30,9 @@
       <!--用户数据-->
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="关键字" prop="userName">
+          <el-form-item label="关键字" prop="keyWord">
             <el-input
-              v-model="queryParams.userName"
+              v-model="queryParams.keyWord"
               placeholder="请输入关键字"
               clearable maxlength="50" 
               style="width: 240px"
@@ -85,16 +85,6 @@
 <!--              @click="handleDelete"-->
 <!--              v-hasPermi="['system:user:remove']"-->
 <!--            >删除</el-button>-->
-<!--          </el-col>-->
-<!--          <el-col :span="1.5">-->
-<!--            <el-button-->
-<!--              type="info"-->
-<!--              plain-->
-<!--              icon="el-icon-upload2"-->
-<!--              size="mini"-->
-<!--              @click="handleImport"-->
-<!--              v-hasPermi="['system:user:import']"-->
-<!--            >导入</el-button>-->
 <!--          </el-col>-->
          <!-- <el-col :span="1.5">
            <el-button
@@ -151,142 +141,7 @@
         />
       </el-col>
     </el-row>
-
+ 
-    <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item v-if="form.houseId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.houseId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户性别">
-              <el-select v-model="form.sex" placeholder="请选择性别">
-                <el-option
-                  v-for="dict in dict.type.sys_user_sex"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="岗位">
-              <el-select v-model="form.postIds" filterable multiple placeholder="请选择岗位">
-                <el-option
-                  v-for="item in postOptions"
-                  :key="item.postId"
-                  :label="item.postName"
-                  :value="item.postId"
-                  :disabled="item.status == 1"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="角色">
-              <el-select v-model="form.roleIds" filterable multiple placeholder="请选择角色">
-                <el-option
-                  v-for="item in roleOptions"
-                  :key="item.roleId"
-                  :label="item.roleName"
-                  :value="item.roleId"
-                  :disabled="item.status == 1"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip text-center" slot="tip">
-          <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
-          </div>
-          <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
-        </div>
-      </el-upload>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
-        <el-button @click="upload.open = false">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
@@ -402,9 +257,6 @@ export default {
   created() {
     this.getList();
     this.getDeptTree();
-    // this.getConfigKey("sys.user.initPassword").then(response => {
-    //   this.initPassword = response.msg;
-    // });
   },
   methods: {
     /** 查询用户列表 */
@@ -479,59 +331,16 @@ export default {
 
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
+      
-      getUser().then(response => {
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.open = true;
-        this.title = "添加用户";
-        this.form.password = this.initPassword;
-      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+  
-      const houseId = row.houseId || this.ids;
-      getUser(houseId).then(response => {
-        this.form = response.data;
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.$set(this.form, "postIds", response.postIds);
-        this.$set(this.form, "roleIds", response.roleIds);
-        this.open = true;
-        this.title = "修改用户";
-        this.form.password = "";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.houseId != undefined) {
-            updateHouseSet(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addHouseSet(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
     },
+     
     /** 删除按钮操作 */
     handleDelete(row) {
-      const houseIds = row.houseId || this.ids;
+  
-      this.$modal.confirm('是否确认删除编号为"' + houseIds + '"的数据项？').then(function() {
-        return delHouseSet(houseIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -539,32 +348,9 @@ export default {
       //   ...this.queryParams
       // }, `user_${new Date().getTime()}.xlsx`)
     },
-    /** 导入按钮操作 */
+ 
-    handleImport() {
+ 
-      this.upload.title = "用户导入";
+     
-      this.upload.open = true;
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      this.download('system/user/importTemplate', {
-      }, `user_template_${new Date().getTime()}.xlsx`)
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-      this.getList();
-    },
-    // 提交上传文件
-    submitFileForm() {
-      this.$refs.upload.submit();
-    }
   }
 };
 </script>