zs 1 rok pred
rodič
commit
26d0e18217

+ 3 - 3
pagesMy/buyExamine/index.vue

@@ -138,10 +138,10 @@
 				};
 				if (user.role == 'kj') {
 					info.status = '0';
-					info.accounting = user._id;
+					info.s_accounting = user._id;
 				} else {
 					info.status = '2';
-					info.leader = user._id;
+					info.s_leader = user._id;
 				}
 				let res;
 				res = await that.$api(`/OrderDetail/queryInfo`, 'GET', {
@@ -328,7 +328,7 @@
 						.image {
 							width: 20vw;
 							height: 20vw;
-							border-radius: 5px;
+							border-radius: 5px;
 							border: 1px solid var(--f9Color);
 						}
 					}

+ 3 - 3
pagesMy/collectionExamin/index.vue

@@ -138,10 +138,10 @@
 				};
 				if (user.role == 'kj') {
 					info.status = '6';
-					info.accounting = user._id;
+					info.c_accounting = user._id;
 				} else {
 					info.status = '7';
-					info.leader = user._id;
+					info.c_leader = user._id;
 				}
 				let res;
 				res = await that.$api(`/OrderDetail/queryInfo`, 'GET', {
@@ -328,7 +328,7 @@
 						.image {
 							width: 20vw;
 							height: 20vw;
-							border-radius: 5px;
+							border-radius: 5px;
 							border: 1px solid var(--f9Color);
 						}
 					}

+ 4 - 4
pagesMy/order/detail.vue

@@ -43,13 +43,13 @@
 				<text>下单时间:</text>
 				<text>{{info.buy_time||'暂无'}}</text>
 			</view>
-			<view class="two_1" v-if="info.leader_name">
+			<view class="two_1" v-if="info.sleader_name">
 				<text>采购审批领导:</text>
-				<text>{{info.leader_name||'暂无'}}</text>
+				<text>{{info.sleader_name||'暂无'}}</text>
 			</view>
-			<view class="two_1" v-if="info.accounting_name">
+			<view class="two_1" v-if="info.saccounting_name">
 				<text>采购审批会计:</text>
-				<text>{{info.accounting_name||'暂无'}}</text>
+				<text>{{info.saccounting_name||'暂无'}}</text>
 			</view>
 		</view>
 		<view class="thr">

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/buyExamine/index.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/collectionExamin/index.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/detail.js.map


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

@@ -335,10 +335,10 @@ var _default = {
                 };
                 if (user.role == 'kj') {
                   info.status = '0';
-                  info.accounting = user._id;
+                  info.s_accounting = user._id;
                 } else {
                   info.status = '2';
-                  info.leader = user._id;
+                  info.s_leader = user._id;
                 }
                 _context3.next = 6;
                 return that.$api("/OrderDetail/queryInfo", 'GET', _objectSpread(_objectSpread({}, info), that.searchInfo));

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

@@ -335,10 +335,10 @@ var _default = {
                 };
                 if (user.role == 'kj') {
                   info.status = '6';
-                  info.accounting = user._id;
+                  info.c_accounting = user._id;
                 } else {
                   info.status = '7';
-                  info.leader = user._id;
+                  info.c_leader = user._id;
                 }
                 _context3.next = 6;
                 return that.$api("/OrderDetail/queryInfo", 'GET', _objectSpread(_objectSpread({}, info), that.searchInfo));

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesMy/order/detail.wxml