zs 1 year ago
parent
commit
9a9f44d833
49 changed files with 81 additions and 59 deletions
  1. 10 5
      pagesMy/buyExamine/index.vue
  2. 9 4
      pagesMy/collectionExamin/index.vue
  3. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  4. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/tabs/index.js.map
  5. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map
  6. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/good/index.js.map
  7. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map
  8. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/market/index.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/index.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/index/index.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/shop/index.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/sort/index.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/index.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/info.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/update.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/buyExamine/index.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/collectionExamin/index.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/add.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/index.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/maintenance/index.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/detail.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/index.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/order.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/record/index.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/repair/detail.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/repair/index.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/add.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/index.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/user/index.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
  38. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.js.map
  41. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid/uni-grid.js.map
  42. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  43. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
  44. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.js.map
  45. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  46. 9 3
      unpackage/dist/dev/mp-weixin/pagesMy/buyExamine/index.js
  47. 1 1
      unpackage/dist/dev/mp-weixin/pagesMy/buyExamine/index.wxml
  48. 8 2
      unpackage/dist/dev/mp-weixin/pagesMy/collectionExamin/index.js
  49. 1 1
      unpackage/dist/dev/mp-weixin/pagesMy/collectionExamin/index.wxml

+ 10 - 5
pagesMy/buyExamine/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="one">
-			<input type="text" v-model="searchInfo.goods" @input="toInput" placeholder="搜索商品">
+			<input type="text" v-model="searchInfo.user_name" @input="toInput" placeholder="搜索用户">
 		</view>
 		<view class="two">
 			<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
@@ -137,8 +137,13 @@
 					skip: that.skip,
 					limit: that.limit,
 				};
-				if (user.role == 'kj') info.s_accounting = user._id;
-				else info.s_leader = user._id;
+				if (user.role == 'kj') {
+					info.s_accounting = user._id;
+					info.status = '0'
+				} else {
+					info.s_leader = user._id;
+					info.status = '2'
+				}
 				let res;
 				res = await that.$api(`/OrderDetail/queryInfo`, 'GET', {
 					...info,
@@ -208,7 +213,7 @@
 			// 输入框
 			toInput(e) {
 				const that = this;
-				if (that.searchInfo.goods) that.$set(that.searchInfo, `goods`, e.detail.value)
+				if (that.searchInfo.user_name) that.$set(that.searchInfo, `user_name`, e.detail.value)
 				else that.$set(that, `searchInfo`, {})
 				that.clearPage();
 				that.search();
@@ -235,7 +240,7 @@
 							const res = await that.$api(`/OrderDetail/${item._id}`, 'POST', obj);
 							if (res.errcode == '0') {
 								uni.showToast({
-									title: '审批完成请等待其他管理员审批',
+									title: '维护信息成功',
 									icon: 'none'
 								})
 								that.clearPage()

+ 9 - 4
pagesMy/collectionExamin/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="one">
-			<input type="text" v-model="searchInfo.goods" @input="toInput" placeholder="搜索商品">
+			<input type="text" v-model="searchInfo.user_name" @input="toInput" placeholder="搜索用户">
 		</view>
 		<view class="two">
 			<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
@@ -137,8 +137,13 @@
 					skip: that.skip,
 					limit: that.limit,
 				};
-				if (user.role == 'kj') info.c_accounting = user._id;
-				else info.c_leader = user._id;
+				if (user.role == 'kj') {
+					info.s_accounting = user._id;
+					info.status = '6'
+				} else {
+					info.s_leader = user._id;
+					info.status = '7'
+				}
 				let res;
 				res = await that.$api(`/OrderDetail/queryInfo`, 'GET', {
 					...info,
@@ -208,7 +213,7 @@
 			// 输入框
 			toInput(e) {
 				const that = this;
-				if (that.searchInfo.goods) that.$set(that.searchInfo, `goods`, e.detail.value)
+				if (that.searchInfo.user_name) that.$set(that.searchInfo, `user_name`, e.detail.value)
 				else that.$set(that, `searchInfo`, {})
 				that.clearPage();
 				that.search();

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/tabs/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/good/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/market/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/index/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/shop/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/sort/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/info.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/update.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/buyExamine/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/collectionExamin/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/add.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/maintenance/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/detail.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/order.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/record/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/repair/detail.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/repair/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/add.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/user/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid/uni-grid.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


+ 9 - 3
unpackage/dist/dev/mp-weixin/pagesMy/buyExamine/index.js

@@ -334,7 +334,13 @@ var _default = {
                   skip: that.skip,
                   limit: that.limit
                 };
-                if (user.role == 'kj') info.s_accounting = user._id;else info.s_leader = user._id;
+                if (user.role == 'kj') {
+                  info.s_accounting = user._id;
+                  info.status = '0';
+                } else {
+                  info.s_leader = user._id;
+                  info.status = '2';
+                }
                 _context3.next = 6;
                 return that.$api("/OrderDetail/queryInfo", 'GET', _objectSpread(_objectSpread({}, info), that.searchInfo));
               case 6:
@@ -420,7 +426,7 @@ var _default = {
     // 输入框
     toInput: function toInput(e) {
       var that = this;
-      if (that.searchInfo.goods) that.$set(that.searchInfo, "goods", e.detail.value);else that.$set(that, "searchInfo", {});
+      if (that.searchInfo.user_name) that.$set(that.searchInfo, "user_name", e.detail.value);else that.$set(that, "searchInfo", {});
       that.clearPage();
       that.search();
     },
@@ -462,7 +468,7 @@ var _default = {
                               _res = _context4.sent;
                               if (_res.errcode == '0') {
                                 uni.showToast({
-                                  title: '审批完成请等待其他管理员审批',
+                                  title: '维护信息成功',
                                   icon: 'none'
                                 });
                                 that.clearPage();

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesMy/buyExamine/index.wxml


+ 8 - 2
unpackage/dist/dev/mp-weixin/pagesMy/collectionExamin/index.js

@@ -334,7 +334,13 @@ var _default = {
                   skip: that.skip,
                   limit: that.limit
                 };
-                if (user.role == 'kj') info.c_accounting = user._id;else info.c_leader = user._id;
+                if (user.role == 'kj') {
+                  info.s_accounting = user._id;
+                  info.status = '6';
+                } else {
+                  info.s_leader = user._id;
+                  info.status = '7';
+                }
                 _context3.next = 6;
                 return that.$api("/OrderDetail/queryInfo", 'GET', _objectSpread(_objectSpread({}, info), that.searchInfo));
               case 6:
@@ -420,7 +426,7 @@ var _default = {
     // 输入框
     toInput: function toInput(e) {
       var that = this;
-      if (that.searchInfo.goods) that.$set(that.searchInfo, "goods", e.detail.value);else that.$set(that, "searchInfo", {});
+      if (that.searchInfo.user_name) that.$set(that.searchInfo, "user_name", e.detail.value);else that.$set(that, "searchInfo", {});
       that.clearPage();
       that.search();
     },

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesMy/collectionExamin/index.wxml