From 05ae3a302227e0ee79dc82fb2ee0473cb07f4f0a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 24 五月 2024 14:46:42 +0800
Subject: [PATCH] 功能调整

---
 src/components/view/b2-standard.vue          |   30 +++---------------------------
 src/components/do/b1-ins-order/add.vue       |    3 ++-
 src/components/tool/excel.vue                |    8 +++++++-
 src/components/view/b2-standard-template.vue |    8 ++++++--
 src/components/view/person-manage.vue        |    2 +-
 5 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 279d71a..ff631de 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -1145,7 +1145,8 @@
         this.getProductLoad = true
         this.$axios.post(this.$api.standardTree.selectStandardProductList, {
           model: row.model + '-' + row.modelNum,
-          standardMethodListId: val
+          standardMethodListId: val,
+          factory: this.selectTree,
         }, {
           headers: {
             'Content-Type': 'application/json'
diff --git a/src/components/tool/excel.vue b/src/components/tool/excel.vue
index 2c4027e..25f85b3 100644
--- a/src/components/tool/excel.vue
+++ b/src/components/tool/excel.vue
@@ -20,6 +20,12 @@
 		cursor: pointer;
 	}
 
+  #luckysheet .save_i{
+    margin-right: 20px;
+    font-size: 20px;
+    cursor: help;
+  }
+
 	#luckysheet .save:hover {
 		opacity: .8;
 	}
@@ -114,7 +120,7 @@
 					cellFormat: false // 璁剧疆鍗曞厓鏍兼牸寮�
 				},
 				option.myFolderUrl = this.LOCATIONVUE + '/',
-				option.functionButton = '<button onClick="excelClosed()" class="save">淇濆瓨</button>'
+				option.functionButton = '<i class="save_i el-icon-info" title="绯荤粺鏀寔鐨勫彉閲忥細&#10搴忓彿&#10妫�楠岄」&#10妫�楠屽瓙椤�&#10璁惧鍚嶇О&#10璁惧缂栫爜&#10鍗曚綅&#10瑕佹眰鍊�&#10璇曢獙鏂规硶 | 妫�娴嬫柟娉�&#10鏈�缁堝��&#10缁撹&#10璁＄畻鍊�&#10妫�楠屽��"></i><button onClick="excelClosed()" class="save">淇濆瓨</button>'
 				luckysheet.create(option)
 			}
 		}
diff --git a/src/components/view/b2-standard-template.vue b/src/components/view/b2-standard-template.vue
index d42a770..dcc22f9 100644
--- a/src/components/view/b2-standard-template.vue
+++ b/src/components/view/b2-standard-template.vue
@@ -62,8 +62,8 @@
 				:upUrl="$api.StandardTemplate.upStandardTemplate" :delUrl="$api.StandardTemplate.delStandardTemplate"
 				:componentData="componentData" :key="upIndex" />
 		</div>
-		<el-dialog title="妯℃澘缂栧埗" :visible.sync="isShow" width="80%" :before-close="isClose">
-			<div style="width: 100%;height: 80vh;overflow: auto;" v-if="isShow">
+		<el-dialog title="妯℃澘缂栧埗" :visible.sync="isShow" width="85%" :before-close="isClose">
+			<div style="width: 100%;height: 82vh;overflow: auto;" v-if="isShow">
 				<Excel :data="row.thing" :execlTitle="row.name" v-loading="loading"></Excel>
 			</div>
 		</el-dialog>
@@ -162,12 +162,16 @@
 					this.componentData.do.splice(1, 1)
 				}
 				if (!up) {
+          this.componentData.do.splice(2, 1)
 					this.componentData.do.splice(0, 1)
 				}
 				this.addPower = add
 			},
 			templateWrite(row) {
 				this.$axios.get(this.$api.StandardTemplate.getEditTemplatePreparation + '?id=' + row.id).then(res => {
+          if(res.code != 200){
+            return
+          }
 					this.row = row
 					this.row.thing = res.data
 					this.isShow = true
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index dcbdf55..1dbd59a 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -577,32 +577,8 @@
         },
         methodList: [],
         productTableLoading0: false,
-        filters0: [{
-            text: '娴嬭瘯',
-            value: 0,
-          },
-          {
-            text: '娴嬭瘯1',
-            value: 1,
-          },
-          {
-            text: '娴嬭瘯2',
-            value: 2,
-          }
-        ],
-        filters1: [{
-            text: '娴嬭瘯',
-            value: 0,
-          },
-          {
-            text: '娴嬭瘯1',
-            value: 1,
-          },
-          {
-            text: '娴嬭瘯2',
-            value: 2,
-          }
-        ],
+        filters0: [],
+        filters1: [],
         pages: 1,
         inspectionItem: null,
         inspectionItemSubclass: null,
@@ -1347,7 +1323,7 @@
           }
         }
         this.$axios.post(this.$api.standardTree.upStandardProducts, {
-          ids: this.moreSelects.map(a => a.id),
+          ids: JSON.stringify(this.moreSelects.map(a => a.id)),
           standardProductList: this.moreInfo
         }, {
           headers: {
diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index 69e4eaa..8dbce50 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -289,7 +289,7 @@
             font: '缂栬緫',
             type: 'text',
             method: 'doDiy',
-            field: ['createUserName', 'updateUserName', 'roleName', '瑙掕壊=roleId', '瀵嗙爜=password',
+            field: ['roleName', '瑙掕壊=roleId', '瀵嗙爜=password',
             '濮撳悕EN=nameEn','骞撮緞=age','閭=email','鍗曚綅=company','绛惧悕=pictureUrl','鏈汉鐓�=signatureUrl']
           }],
           tagField: {

--
Gitblit v1.9.3