From a4e8c717b8bba52eb8f3cce97e7babb44f6b0cd0 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 7 Jan 2025 17:48:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E7=AE=A1=E7=90=86=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../lease/apply/component/addToolsApply.vue | 11 ++
src/views/material/lease/protocol/index.vue | 144 ++++++++----------
.../goodsArrived/component/addTools.vue | 2 +-
3 files changed, 75 insertions(+), 82 deletions(-)
diff --git a/src/views/material/lease/apply/component/addToolsApply.vue b/src/views/material/lease/apply/component/addToolsApply.vue
index dd1b8350..ff7ee67f 100644
--- a/src/views/material/lease/apply/component/addToolsApply.vue
+++ b/src/views/material/lease/apply/component/addToolsApply.vue
@@ -106,6 +106,17 @@
@change="deviceTypeChange"
>
+
+
+
diff --git a/src/views/material/lease/protocol/index.vue b/src/views/material/lease/protocol/index.vue
index 069250dc..481d2d95 100644
--- a/src/views/material/lease/protocol/index.vue
+++ b/src/views/material/lease/protocol/index.vue
@@ -95,28 +95,23 @@
-
+
查看
编辑
删除
@@ -137,24 +132,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
-
+
+ :disabled="isEdits"
+ > -->
+
@@ -498,8 +474,12 @@ import {forEach} from 'jszip';
import {listUser} from "@/api/system/user";
import {getListProject, getListUnite} from "@/api/lease/apply";
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
export default {
name: "supplier",
+ components: { Treeselect },
data() {
return {
uploadKey: Date.now(),
@@ -583,7 +563,10 @@ export default {
dialogImageUrl: '',
dialogVisible: false,
// 表单参数
- form: {},
+ form: {
+ unitId:null,
+ projectId:null,
+ },
// 表单校验
rules: {
unitId: [
@@ -690,7 +673,7 @@ export default {
}
},
-
+ //上传组件-图片删除
handleRemoveElectricianImgList(file, fileList) {
let sum = 0
this.businessLicenseListTemp.forEach((item, index) => {
@@ -703,8 +686,7 @@ export default {
this.delBusinessFileIdList.push(file.url);
}
console.log('delBusinessFileIdList', this.delBusinessFileIdList)
- },
-
+ },
isImage(file) {
this.urlTemp = require('@/assets/file.png');
if (this.updataIf(file)) {
@@ -732,8 +714,7 @@ export default {
return true
}
}
- },
-
+ },
handleDownload(file) {
console.log(file)
if (file.status === 'ready') {
@@ -743,8 +724,7 @@ export default {
downloadFileData({fileName: file.name, fileUrl: file.url})
// downloadFileData({ fileName: file.name,fileUrl:file.url })
}
- },
-
+ },
handleChangeBusinessList(file, fileList) {
const fileListTemp = fileList.filter(item => {
return item.uid != file.uid
@@ -786,7 +766,10 @@ export default {
this.businessLicenseListTemp = fileList;
},
- async getList() {
+
+
+ //查询列表
+ getList() {
this.loading = true;
const params = {
keyWord: this.queryParams.keyWord,
@@ -801,29 +784,31 @@ export default {
this.total = response.total;
this.loading = false;
});
- },
-
+ },
+ /** 转换菜单数据结构 */
+ normalizer(node) {
+ if (node.children && !node.children.length) {
+ delete node.children;
+ }
+ return {
+ id: node.id,
+ label: node.name,
+ children: node.children,
+ };
+ },
//获取单位类型 ,getUnitList, getProjectList
- async getUnitList() {
- // getUnitList({}).then((response) => {
- // this.unitList = response.data
- // })
+ getUnitList() {
getListUnite({projectId: null}).then((response) => {
this.uniteList = response.data;
});
- },
-
- async getProjectList() {
- // getProjectList({}).then((response) => {
- // this.projectList = response.data
- // })
+ },
+ getProjectList() {
getListProject({unitId: null}).then((response) => {
this.projectList = response.data;
});
},
- uniteChange(val) {
- // this.projectList = [];
+ uniteChange(val) {
if (val && val.length > 0) {
this.maForm.unitId = this.unitId[this.unitId.length - 1];
} else if (val && val.length == 0) {
@@ -869,10 +854,7 @@ export default {
this.maForm.unitId = response.data.unitId;
this.maForm.projectId = response.data.projectId;
this.unitId = this.treeParentsById(this.uniteList, this.maForm.unitId);
- this.projectId = this.treeParentsById(
- this.projectList,
- this.maForm.projectId
- );
+ this.projectId = this.treeParentsById(this.projectList,this.maForm.projectId);
var taskId = this.form.taskId
console.log(taskId)
@@ -1003,8 +985,8 @@ export default {
//** 提交按钮 */
submitForm() {
- this.form.unitId = this.maForm.unitId;
- this.form.projectId = this.maForm.projectId;
+ // this.form.unitId = this.maForm.unitId;
+ // this.form.projectId = this.maForm.projectId;
this.$refs["form"].validate(async valid => {
console.log("this.maForm", this.maForm)
diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue
index fdb5ab81..7cb9719e 100644
--- a/src/views/material/purchase/goodsArrived/component/addTools.vue
+++ b/src/views/material/purchase/goodsArrived/component/addTools.vue
@@ -81,7 +81,7 @@
maxlength="150"
type="textarea"
style="width: 240px"
- rows="1"
+ rows="2"
/>