bug修复

src/views/material/archives/index.vue

@@ -186,6 +186,8 @@
       <el-upload ref="upload" :limit="20" :headers="upload.headers" :multiple="true" drag 
                  :action="upload.url" style="width: 100%;" :file-list="fileList"
                  :on-success="handleSuccess" :on-error="handleError" :on-remove="handleFileRemove"
+                 :before-upload="beforeUpload"
+                 accept=".rar,.zip"
       >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
@@ -594,6 +596,21 @@ export default {
         this.dialogVisible = true
       } 
     },
+
+    beforeUpload(file) {
+      const isRarOrZip = ['.rar', '.zip'].some(ext => file.name.toLowerCase().endsWith(ext));
+      if (!isRarOrZip) {
+        this.$message.error('仅支持上传 rar 或 zip 格式的文件');
+        return false;
+      }
+      const isLt5M = file.size / 1024 / 1024 < 5;
+      if (!isLt5M) {
+        this.$message.error('单个文件大小不能超过 5MB');
+        return false;
+      }
+      return true;
+    },
+
     // 节点单击事件 - 左侧树
     handleNodeClick(data, node) {
       console.log(data)

src/views/material/basic/unitType/index.vue

@@ -139,8 +139,8 @@
 
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" >
-        <el-form-item label="字典类型">
+        <el-form-item label="字典类型" v-show="false">
           <el-input v-model="desensitizedDictType" :disabled="true" />
         </el-form-item>
         <el-form-item label="单位类型" prop="dictLabel">

src/views/material/cost/component/applyHome.vue

@@ -70,13 +70,13 @@
                     @click="resetQuery"
                     >重置</el-button
                 >
-                <el-button
+                <!-- <el-button
                     type="primary"
                     plain
                     size="mini"
                     @click="handleApplyList"
                     >批量结算</el-button
-                >
+                > -->
                 <el-button
                     type="primary"
                     plain

src/views/material/lease/protocol/index.vue

@@ -70,7 +70,7 @@
             <!--      <el-table-column label="租赁期限(天)" align="center" prop="leaseDay" width="100"/>-->
             <el-table-column label="授权人" align="center" prop="authPerson" width="100" />
             <el-table-column label="授权人电话" align="center" prop="phone" width="120" />
-            <el-table-column label="分部工程" align="center" prop="branchProject" />
+            <el-table-column label="分部工程" align="center" prop="branchProIdsStr" width="150"/>
             <el-table-column label="租赁单位类型" align="center" width="100">
                 <template slot-scope="scope">
                     <span v-if="scope.row.protocol == '1'">内部单位</span>
@@ -365,12 +365,15 @@
                 <el-descriptions-item label="开始日期">
                     {{ form.planStartTime }}
                 </el-descriptions-item>
-                <el-descriptions-item label="备注">
-                    {{ form.remark }}
-                </el-descriptions-item>
                 <el-descriptions-item label="租赁单位类型">
                     {{ form.protocol === '1' ? '内部单位' : '外部单位' }}
                 </el-descriptions-item>
+                <el-descriptions-item label="分部工程">
+                    {{ form.branchProIdsStr }}
+                </el-descriptions-item>
+                <el-descriptions-item label="备注">
+                    {{ form.remark }}
+                </el-descriptions-item>
             </el-descriptions>
 
             <el-descriptions :column="1" border style="width: 100%">
@@ -879,7 +882,7 @@ export default {
                 this.maForm.projectId = response.data.projectId
                 this.unitId = this.treeParentsById(this.uniteList, this.maForm.unitId)
                 this.projectId = this.treeParentsById(this.projectList, this.maForm.projectId)
-
+                console.log("vvvvvvvvvvvvvvvvv",this.form)
                 var taskId = this.form.taskId
                 console.log(taskId)
                 if (taskId) {
@@ -1028,9 +1031,11 @@ export default {
                         // this.form.fileName =null;
                         const reqData = new FormData()
                         if (this.businessLicenseListTemp.length != 0) {
+                             console.log("xxxxxxxxxxxxxx",this.form)
                             await this.getImaUploadEdit(), await this.editAgreementTemp(this.form)
                             await this.deleteFile()
                         } else {
+                            console.log("xxxxxxxxxxxxxx",this.form)
                             await this.editAgreementTemp(this.form)
                             await this.deleteFile()
                         }

src/views/material/ma/mechEquipConfigMgmt/index.vue

@@ -482,6 +482,7 @@ export default {
                 this.form.typeModel = []
                 this.getList()
                 this.getTreeData()
+                this.open = false
                 loading.close()
               })
               .catch(err => {
@@ -588,7 +589,7 @@ export default {
           try {
             if (this.isAddTree) {
               // 新增
-              addConfig(this.configForm).then(res => {
+              addConfig(this.configForm).then(async res => {
                 this.$modal.msgSuccess('新增成功')
                 this.getTreeData()
                 this.configVisible = false

src/views/material/purchase/goodsBind/component/bindTools.vue

@@ -580,7 +580,7 @@ export default {
       this.viewCodeVisible = true;
       getMaCodeInfo({ taskId: row.taskId, typeId: row.typeId, keyWord:this.codeForm.keyWord }).then(
         (response) => {
-          this.viewCodeList = response.rows;
+          this.viewCodeList = response.data;
           this.titleBind = "查看";
         }
       );
@@ -599,7 +599,11 @@ export default {
       this.unbindIds = selection.map(item => {return item.id})
     },
     codeUnBind(){
-      console.log(this.unbindIds)
+      if(this.unbindIds.length == 0){
+        this.$modal.msgError("请勾选数据！");
+        return;
+      }
+      console.log("xxxxxxxxx",this.unbindIds)
       let param = {
 
       }
@@ -611,7 +615,7 @@ export default {
     codeQuery() {
       getMaCodeInfo({ taskId: this.codeForm.taskId, typeId: this.codeForm.typeId, keyWord:this.codeForm.keyWord }).then(
         (response) => {
-          this.viewCodeList = response.rows;
+          this.viewCodeList = response.data;
         }
       );
     },

src/views/material/repair/repairManage/component/edit.vue

@@ -478,13 +478,13 @@
                 <el-col :span="9">
                   <el-form-item label="配件数量" prop="partNum" label-width="80px"  >
                     <el-input v-model.number="item.partNum" placeholder="请输入配件数量" 
-                      maxlength="20" type="number" :min="0" style="width: 90px"></el-input>
+                      maxlength="20" type="number" :min="0" style="width: 90px" @change="partNumChange(item, $event)"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="9">
                   <el-form-item label="金额" prop="partPrice" label-width="70px">
                     <el-input v-model.number="item.partPrice" placeholder="请输入金额"
-                      maxlength="20" type="number" :min="0" style="width: 95px">
+                      maxlength="20" type="number" :min="0" style="width: 95px" @change="partPriceChange(item, $event)">
                     </el-input>
                   </el-form-item>
                 </el-col>
@@ -1478,6 +1478,23 @@ export default {
         item.partNum=item.storageNum
       }
     },
+
+    partNumChange(item,value) {
+      console.log("xxxxxxxxxx",item,value)
+    if (value < 0) {
+      this.$message.error('配件数量不能小于 0，请重新输入。');
+      // 把输入值重置为 0
+      this.$set(item, 'partNum', 0);
+      }
+    },
+    partPriceChange(item,value) {
+      console.log("xxxxxxxxxx",item,value)
+    if (value < 0) {
+      this.$message.error('配件金额不能小于 0，请重新输入。');
+      // 把输入值重置为 0
+      this.$set(item, 'partPrice', 0);
+      }
+    },
     //数量-左侧-内部维修-添加
     addPartItem() {
       this.partItems.push({ partNum: "", partType: "0", partId:null, storageNum:"" });

src/views/system/user/index.vue

@@ -67,12 +67,12 @@
             >删除
             </el-button>
           </el-col>
-          <el-col :span="1.5">
+          <!-- <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> -->
           <el-col :span="1.5">
             <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
                        v-hasPermi="['system:user:export']"