修改订单详情

pages/market/index.vue

@@ -312,7 +312,7 @@
 				let list = that.list;
 				const user = that.user;
 				if (user && user._id) {
-					if (user.role == 'jdry' || user.role == '社区人员') {
+					if (user.role == 'jdry' || user.role == 'sqry') {
 						let cartIds = [];
 						for (let val of list) {
 							for (let s of val.list) {

pagesGoods/index/index.vue

@@ -231,7 +231,8 @@
 						spec: specsInfo._id,
 						goods: info._id,
 						num: that.buy_num,
-						money: parseFloat(specsInfo.money) * that.buy_num
+						money: specsInfo.money,
+						total_money: that.$multiply(specsInfo.money, that.buy_num)
 					}
 					res = await that.$api(`/Cart`, 'POST', obj)
 					if (res.errcode == '0') {

pagesMy/buyExamine/index.vue

@@ -28,7 +28,7 @@
 										<text>{{item.good_name||'暂无'}}</text>
 									</view>
 									<view class="num">
-										<text>￥{{item.money||'0'}}</text>
+										<text>￥{{item.total_money||'0'}}</text>
 										<text>×{{item.num||'0'}}</text>
 									</view>
 								</view>
@@ -39,6 +39,9 @@
 									<view class="spec textOver">
 										<text>购买用户：{{item.user_name||'暂无'}}</text>
 									</view>
+									<view class="spec textOver">
+										<text>用户角色：{{item.zhRole||'暂无'}}</text>
+									</view>
 								</view>
 							</view>
 						</view>
@@ -74,6 +77,7 @@
 				scrollTop: 0,
 				// 字典表
 				statusList: [],
+				roleList: []
 			}
 		},
 		onLoad: function(e) {
@@ -144,7 +148,8 @@
 				if (res.errcode == '0') {
 					let list = [...that.list, ...res.data];
 					for (let val of list) {
-						val.zhStatus = that.searchStatus(val.status)
+						val.zhStatus = that.searchDict(val.status, 'status')
+						val.zhRole = that.searchDict(val.user_role, 'role')
 					}
 					that.$set(that, `list`, list);
 					that.$set(that, `total`, res.total)
@@ -161,12 +166,19 @@
 					url: `/pagesMy/order/detail?id=${e.id||e._id}`
 				})
 			},
-			// 查询状态
-			searchStatus(e) {
+			// 查询字典表
+			searchDict(e, model) {
 				const that = this;
-				let data = that.statusList.find((i) => i.value == e);
-				if (data) return data.label
-				else return '暂无'
+				let data
+				if (model == 'status') {
+					data = that.statusList.find((i) => i.value == e);
+					if (data) return data.label
+					else return '暂无'
+				} else if (model == 'role') {
+					data = that.roleList.find((i) => i.code == e);
+					if (data) return data.name
+					else return '暂无'
+				}
 			},
 			// 分页
 			toPage(e) {
@@ -246,6 +258,11 @@
 					type: 'order_status'
 				})
 				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
+				// 查询角色
+				res = await that.$api(`/Role`, 'GET', {
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `roleList`, res.data);
 			},
 			// 清空列表
 			clearPage() {

pagesMy/collectionExamin/index.vue

@@ -28,7 +28,7 @@
 										<text>{{item.good_name||'暂无'}}</text>
 									</view>
 									<view class="num">
-										<text>￥{{item.money||'0'}}</text>
+										<text>￥{{item.total_money||'0'}}</text>
 										<text>×{{item.num||'0'}}</text>
 									</view>
 								</view>

pagesMy/order/detail.vue

@@ -1,7 +1,82 @@
 <template>
 	<view class="content">
-		<view class="text-area">
-			<text class="title">{{title}}</text>
+		<view class="one">
+			<view class="one_1">
+				<text>
+					<text class="iconfont icon-changshangguanli"></text>
+					{{info.supplier_name}}
+				</text>
+				<text class="status">{{info.zhStatus}}</text>
+			</view>
+			<view class="one_2">
+				<view class="left">
+					<image v-if="info.spec_file" class="image"
+						:src="info.spec_file&&info.spec_file.length>0?info.spec_file[0].url:''" mode="">
+					</image>
+					<image v-else class="image" :src="info.good_file&&info.good_file.length>0?info.good_file[0].url:''"
+						mode="">
+					</image>
+				</view>
+				<view class="right">
+					<view class="name textOver">
+						<text>{{info.zhType||'暂无'}}</text>
+						<text>{{info.good_name||'暂无'}}</text>
+					</view>
+					<view class="spec textOver">
+						<text>规格：{{info.spec_name||'暂无'}}</text>
+					</view>
+					<view class="num">
+						<text>数量：{{info.num||'暂无'}}</text>
+					</view>
+					<view class="money">
+						<text>￥{{info.money||'暂无'}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="two">
+			<view class="two_1">
+				<text>订单号：</text>
+				<text>{{info.order_id||'暂无'}}</text>
+			</view>
+			<view class="two_1">
+				<text>下单时间：</text>
+				<text>{{info.buy_time||'暂无'}}</text>
+			</view>
+			<view class="two_1">
+				<text>采购审批领导：</text>
+				<text>{{info.leader_name||'暂无'}}</text>
+			</view>
+			<view class="two_1">
+				<text>采购审批会计：</text>
+				<text>{{info.accounting_name||'暂无'}}</text>
+			</view>
+		</view>
+		<view class="thr">
+			<view class="thr_1">
+				<text>下单人员：</text>
+				<text>{{info.user_name||'暂无'}}</text>
+			</view>
+			<view class="thr_1">
+				<text>下单角色：</text>
+				<text>{{info.zhRole||'暂无'}}</text>
+			</view>
+			<view class="thr_1">
+				<text>下单人员电话：</text>
+				<text>{{info.user_tel||'暂无'}}</text>
+			</view>
+			<view class="thr_1">
+				<text>收货地址：</text>
+				<text>{{info.address||'暂无'}}</text>
+			</view>
+		</view>
+		<view class="four">
+			<view class="left">
+				<text>商品总价</text>
+			</view>
+			<view class="right">
+				<text>￥{{info.total_money||'暂无'}}</text>
+			</view>
 		</view>
 	</view>
 </template>
@@ -13,6 +88,10 @@
 				id: '',
 				user: {},
 				info: {},
+				// 字典表
+				statusList: [],
+				typeList: [],
+				roleList: []
 			}
 		},
 		onLoad: async function(e) {
@@ -41,6 +120,9 @@
 				if (that.id) {
 					const res = await that.$api(`/OrderDetail/detail/${that.id}`, 'GET', {})
 					if (res.errcode == '0') {
+						res.data.zhStatus = that.searchDict(res.data.status, 'status')
+						res.data.zhType = that.searchDict(res.data.good_type, 'type')
+						res.data.zhRole = that.searchDict(res.data.user_role, 'role')
 						that.$set(that, `info`, res.data)
 					} else {
 						uni.showToast({
@@ -49,6 +131,24 @@
 					}
 				}
 			},
+			// 查询字典表
+			searchDict(e, model) {
+				const that = this;
+				let data
+				if (model == 'status') {
+					data = that.statusList.find((i) => i.value == e);
+					if (data) return data.label
+					else return '暂无'
+				} else if (model == 'type') {
+					data = that.typeList.find((i) => i.value == e);
+					if (data) return data.label
+					else return '暂无'
+				} else {
+					data = that.roleList.find((i) => i.code == e);
+					if (data) return data.name
+					else return '暂无'
+				}
+			},
 			// 查询其他信息
 			async searchOther() {
 				const that = this;
@@ -59,21 +159,140 @@
 					is_use: '0',
 				})
 				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
+				// 查询类型
+				res = await that.$api(`/DictData`, 'GET', {
+					type: 'goods_type',
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `typeList`, res.data);
+				// 查询角色
+				res = await that.$api(`/Role`, 'GET', {
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `roleList`, res.data);
 			},
 		}
 	}
 </script>
 
-<style>
+<style lang="scss">
 	.content {
 		display: flex;
 		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
+		width: 100vw;
+		height: 100vh;
+		background-color: var(--f9Color);
 
-	.text-area {
-		display: flex;
-		justify-content: center;
+		.one {
+			margin: 2vw 2vw 0 2vw;
+			padding: 0 2vw;
+			border-radius: 10px;
+			background-color: var(--mainColor);
+
+			.one_1 {
+				display: flex;
+				justify-content: space-between;
+				padding: 2vw 0;
+				font-size: var(--font16Size);
+				border-bottom: 1px solid var(--f9Color);
+
+				.status {
+					font-size: var(--font14Size);
+					color: var(--fF0Color);
+				}
+			}
+
+			.one_2 {
+				display: flex;
+				padding: 2vw 0;
+
+				.left {
+					.image {
+						width: 25vw;
+						height: 25vw;
+						border-radius: 5px;
+					}
+				}
+
+				.right {
+					width: 65vw;
+					margin: 0 0 0 2vw;
+
+					.name {
+						padding: 1vw 0 0 0;
+						font-size: var(--font14Size);
+
+						text:first-child {
+							font-size: var(--font12Size);
+							color: var(--mainColor);
+							background-color: var(--f3CColor);
+							border-radius: 5px;
+							padding: 2px 5px;
+						}
+					}
+
+					.spec {
+						font-size: var(--font12Size);
+					}
+
+					.num {
+						font-size: var(--font12Size);
+						color: var(--f85Color);
+					}
+
+					.money {
+						font-size: var(--font14Size);
+						font-weight: bold;
+					}
+
+				}
+			}
+		}
+
+		.two {
+			margin: 2vw 2vw 0 2vw;
+			padding: 2vw;
+			border-radius: 10px;
+			background-color: var(--mainColor);
+
+			.two_1 {
+				padding: 2vw 0;
+				font-size: var(--font14Size);
+
+				text:first-child {
+					color: var(--f85Color);
+				}
+			}
+		}
+
+		.thr {
+			margin: 2vw 2vw 0 2vw;
+			padding: 0 2vw;
+			border-radius: 10px;
+			background-color: var(--mainColor);
+
+			.thr_1 {
+				padding: 2vw 0;
+				font-size: var(--font14Size);
+
+				text:first-child {
+					color: var(--f85Color);
+				}
+			}
+		}
+
+		.four {
+			display: flex;
+			justify-content: space-between;
+			margin: 2vw 2vw 0 2vw;
+			padding: 2vw;
+			border-radius: 10px;
+			background-color: var(--mainColor);
+			font-size: var(--font14Size);
+
+			.left {
+				color: var(--f85Color);
+			}
+		}
 	}
 </style>

pagesMy/order/index.vue

@@ -30,7 +30,7 @@
 												<text>{{item.good_name||'暂无'}}</text>
 											</view>
 											<view class="num">
-												<text>￥{{item.money||'0'}}</text>
+												<text>￥{{item.total_money||'0'}}</text>
 												<text>×{{item.num||'0'}}</text>
 											</view>
 										</view>

pagesMy/order/order.vue

@@ -28,7 +28,7 @@
 										<text>{{item.good_name||'暂无'}}</text>
 									</view>
 									<view class="num">
-										<text>￥{{item.money||'0'}}</text>
+										<text>￥{{item.total_money||'0'}}</text>
 										<text>×{{item.num||'0'}}</text>
 									</view>
 								</view>

unpackage/dist/dev/mp-weixin/pages/market/index.js

@@ -500,7 +500,7 @@ var _default =
                 list = that.list;
                 user = that.user;if (!(
                 user && user._id)) {_context6.next = 17;break;}if (!(
-                user.role == 'jdry' || user.role == '社区人员')) {_context6.next = 14;break;}
+                user.role == 'jdry' || user.role == 'sqry')) {_context6.next = 14;break;}
                 cartIds = [];_iterator11 = _createForOfIteratorHelper(
                 list);try {for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {val = _step11.value;_iterator12 = _createForOfIteratorHelper(
                     val.list);try {for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {s = _step12.value;

unpackage/dist/dev/mp-weixin/pages/procure/index.js

@@ -0,0 +1 @@
+Component({})

unpackage/dist/dev/mp-weixin/pages/procure/index.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "采购",
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pagesGoods/index/index.js

@@ -394,7 +394,8 @@ var _default =
                   spec: specsInfo._id,
                   goods: info._id,
                   num: that.buy_num,
-                  money: parseFloat(specsInfo.money) * that.buy_num };_context3.next = 8;return (
+                  money: specsInfo.money,
+                  total_money: that.$multiply(specsInfo.money, that.buy_num) };_context3.next = 8;return (
 
                   that.$api("/Cart", 'POST', obj));case 8:res = _context3.sent;
                 if (res.errcode == '0') {

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

@@ -190,6 +190,9 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
 var _default =
 {
   data: function data() {
@@ -207,7 +210,8 @@ var _default =
       is_bottom: false,
       scrollTop: 0,
       // 字典表
-      statusList: [] };
+      statusList: [],
+      roleList: [] };
 
   },
   onLoad: function onLoad(e) {
@@ -278,7 +282,8 @@ var _default =
                 if (res.errcode == '0') {
                   list = [].concat(_toConsumableArray(that.list), _toConsumableArray(res.data));_iterator = _createForOfIteratorHelper(
                   list);try {for (_iterator.s(); !(_step = _iterator.n()).done;) {val = _step.value;
-                      val.zhStatus = that.searchStatus(val.status);
+                      val.zhStatus = that.searchDict(val.status, 'status');
+                      val.zhRole = that.searchDict(val.user_role, 'role');
                     }} catch (err) {_iterator.e(err);} finally {_iterator.f();}
                   that.$set(that, "list", list);
                   that.$set(that, "total", res.total);
@@ -295,12 +300,19 @@ var _default =
         url: "/pagesMy/order/detail?id=".concat(e.id || e._id) });
 
     },
-    // 查询状态
-    searchStatus: function searchStatus(e) {
+    // 查询字典表
+    searchDict: function searchDict(e, model) {
       var that = this;
-      var data = that.statusList.find(function (i) {return i.value == e;});
-      if (data) return data.label;else
-      return '暂无';
+      var data;
+      if (model == 'status') {
+        data = that.statusList.find(function (i) {return i.value == e;});
+        if (data) return data.label;else
+        return '暂无';
+      } else if (model == 'role') {
+        data = that.roleList.find(function (i) {return i.code == e;});
+        if (data) return data.name;else
+        return '暂无';
+      }
     },
     // 分页
     toPage: function toPage(e) {
@@ -379,7 +391,12 @@ var _default =
                   that.$api("/DictData", 'GET', {
                     type: 'order_status' }));case 3:res = _context6.sent;
 
-                if (res.errcode == '0') that.$set(that, "statusList", res.data);case 5:case "end":return _context6.stop();}}}, _callee6);}))();
+                if (res.errcode == '0') that.$set(that, "statusList", res.data);
+                // 查询角色
+                _context6.next = 7;return that.$api("/Role", 'GET', {
+                  is_use: '0' });case 7:res = _context6.sent;
+
+                if (res.errcode == '0') that.$set(that, "roleList", res.data);case 9:case "end":return _context6.stop();}}}, _callee6);}))();
     },
     // 清空列表
     clearPage: function clearPage() {

unpackage/dist/dev/mp-weixin/pagesMy/order/deatil.js

@@ -0,0 +1 @@
+Component({})

unpackage/dist/dev/mp-weixin/pagesMy/order/deatil.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "订单详情",
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pagesMy/order/detail.wxss

@@ -1,12 +1,101 @@
-
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
 .content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-}
-.text-area {
-	display: flex;
-	justify-content: center;
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+  background-color: var(--f9Color);
+}
+.content .one {
+  margin: 2vw 2vw 0 2vw;
+  padding: 0 2vw;
+  border-radius: 10px;
+  background-color: var(--mainColor);
+}
+.content .one .one_1 {
+  display: flex;
+  justify-content: space-between;
+  padding: 2vw 0;
+  font-size: var(--font16Size);
+  border-bottom: 1px solid var(--f9Color);
+}
+.content .one .one_1 .status {
+  font-size: var(--font14Size);
+  color: var(--fF0Color);
+}
+.content .one .one_2 {
+  display: flex;
+  padding: 2vw 0;
+}
+.content .one .one_2 .left .image {
+  width: 25vw;
+  height: 25vw;
+  border-radius: 5px;
+}
+.content .one .one_2 .right {
+  width: 65vw;
+  margin: 0 0 0 2vw;
+}
+.content .one .one_2 .right .name {
+  padding: 1vw 0 0 0;
+  font-size: var(--font14Size);
+}
+.content .one .one_2 .right .name text:first-child {
+  font-size: var(--font12Size);
+  color: var(--mainColor);
+  background-color: var(--f3CColor);
+  border-radius: 5px;
+  padding: 2px 5px;
+}
+.content .one .one_2 .right .spec {
+  font-size: var(--font12Size);
+}
+.content .one .one_2 .right .num {
+  font-size: var(--font12Size);
+  color: var(--f85Color);
+}
+.content .one .one_2 .right .money {
+  font-size: var(--font14Size);
+  font-weight: bold;
+}
+.content .two {
+  margin: 2vw 2vw 0 2vw;
+  padding: 2vw;
+  border-radius: 10px;
+  background-color: var(--mainColor);
+}
+.content .two .two_1 {
+  padding: 2vw 0;
+  font-size: var(--font14Size);
+}
+.content .two .two_1 text:first-child {
+  color: var(--f85Color);
+}
+.content .thr {
+  margin: 2vw 2vw 0 2vw;
+  padding: 0 2vw;
+  border-radius: 10px;
+  background-color: var(--mainColor);
+}
+.content .thr .thr_1 {
+  padding: 2vw 0;
+  font-size: var(--font14Size);
+}
+.content .thr .thr_1 text:first-child {
+  color: var(--f85Color);
+}
+.content .four {
+  display: flex;
+  justify-content: space-between;
+  margin: 2vw 2vw 0 2vw;
+  padding: 2vw;
+  border-radius: 10px;
+  background-color: var(--mainColor);
+  font-size: var(--font14Size);
+}
+.content .four .left {
+  color: var(--f85Color);
 }
 

unpackage/dist/dev/mp-weixin/pagesMy/shop/index.js

@@ -0,0 +1 @@
+Component({})

unpackage/dist/dev/mp-weixin/pagesMy/shop/index.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "采购清单",
+  "enablePullDownRefresh": true,
+  "usingComponents": {}
+}