lhl 10 months ago
parent
commit
e7a5099937
2 changed files with 31 additions and 17 deletions
  1. 28 16
      src/pages/erp/product/index.vue
  2. 3 1
      src/pages/erp/user/index.vue

+ 28 - 16
src/pages/erp/product/index.vue

@@ -339,8 +339,13 @@
 				})
 			},
 			tbprod(row, index) {
-				this.isDan = true;
-				this.upGoods(row, index)
+				try{
+					this.isDan = true;
+					this.upGoods(row, index)
+				}catch(err) {
+					console.log(err)
+				}
+				
 			},
 			changeSwitch(row) {
 				console.log(row, row.id, row.is_show)
@@ -398,6 +403,7 @@
 				// that.upGoods(that.tableList[index],index)
 			},
 			setUpdate(good) {
+				console.log(good,'good')
 				return {
 					"stock": 10,
 					"is_weigh": good.is_weigh,
@@ -418,7 +424,7 @@
 					"freight": 1,
 					"postage": 0,
 					"custom_form": [],
-					"cate_id": [
+					"cate_id": (good.cate_id && good.cate_id.split(','))||[
 						1,
 						2
 					],
@@ -499,20 +505,26 @@
 				}
 			},
 			upGoods(good, index) {
-				let qdata = this.setUpdate()
-				if (this.stId && this.stId > good.id) {
-					return;
-				}
-				productAddApi(qdata).then(res => {
-					this.$Message.success(res.msg);
-					if (this.isDan) {
-						return this.isDan = false;
-					} else {
-						index++;
-						this.begin(index);
+				try {
+					let qdata = this.setUpdate(good)
+					if (this.stId && this.stId > good.id) {
+						return;
 					}
-
-				})
+					productAddApi(qdata).then(res => {
+						this.$Message.success(res.msg);
+						if (this.isDan) {
+							return this.isDan = false;
+						} else {
+							index++;
+							this.begin(index);
+						}
+					
+					})
+				} catch (error) {
+					console.log(error,'error')
+					//TODO handle the exception
+				}
+				
 			},
 			look(row) {
 				try {

+ 3 - 1
src/pages/erp/user/index.vue

@@ -45,6 +45,8 @@
 					<a @click="look(row)">详情</a>
 					<Divider type="vertical" v-auth="['admin-erp-user_add']"/>
 					<a @click="edit(row)" v-auth="['admin-erp-user_add']">编辑</a>
+					<Divider type="vertical" v-auth="['admin-erp-user_del']"/>
+					<a @click="del(row, '删除用户', index)" v-auth="['admin-erp-user_del']">删除</a>
 				</template>
 			</Table>
 			<div class="acea-row row-right page">
@@ -249,7 +251,7 @@
 				let delfromData = {
 					title: tit,
 					num: num,
-					url: `marketing/integral/${row.id}`,
+					url: `/erp/user/del/${row.id}`,
 					method: "DELETE",
 					ids: "",
 				};