合同会签

package_sub/order/service.vue

@@ -45,7 +45,7 @@
 <style scoped lang="scss">
 	.page {
 		position: relative;
-		background-color: #f5efee;
+		// background-color: #f5efee;
 		height:100vh;
 	}
 

package_sub/pages/AddOrder/AddOrder.vue

@@ -134,6 +134,17 @@
           :error-type="['toast']"
         >
           <view class="form-card form-card-1">
+			  <!-- 站点 根据前面选择的站点来 -->
+			  <u-form-item label="站点区域" prop="site_id" required>
+				<u-input
+				  :type="!!orderId || canSelectSite ? 'input' : 'select'"
+				  placeholder="请选择站点区域"
+				:disabled="!!orderId || canSelectSite"
+				  :value="site_name"
+				  :select-open="isShowSite"
+				  @click="orderId || canSelectSite ? false : (isShowSite = true)"
+				/>
+			  </u-form-item>
             <u-form-item label="预约人" prop="appoint_name" required>
               <u-input
                 ref="appointNameInput"
@@ -522,6 +533,15 @@
         </view>
       </view>
     </u-popup>
+	<!-- 如果前面没有选站点 就需要选择产品下的站点 -->
+	
+	<u-select
+	  v-model="isShowSite"
+	  value-name="id"
+	  @confirm="confirmSite"
+	  label-name="name"
+	  :list="list_psite"
+	></u-select>
     <!-- 选择就诊人，可以新增 -->
     <u-popup
       v-model="isShowArchive"
@@ -801,6 +821,10 @@ export default {
       list_archive: [],
       orderId: "",
       nurse: {},
+	  isShowSite:false,
+	  list_psite: [],
+	  site_name:'',
+	  canSelectSite:false, // 是否需要选择 站点
       form: {
         type: 1,
         is_show: false,
@@ -878,6 +902,13 @@ export default {
             trigger: ["blur", "change"],
           },
         ],
+		site_id: [
+		  {
+		    required: true,
+		    message: "请选择站点区域",
+		    trigger: ["blur", "change"],
+		  },
+		],
       },
       action: `${baseUrl}/api/mobile/upload-file`,
       isAuth: false,
@@ -899,15 +930,23 @@ export default {
     this.form.can_multi_num = option.can_multi_num ? Number(option.can_multi_num) : 0
     this.form.accompany_product_id = option.id ? Number(option.id) : "";
     this.form.type = Number(option.type);
+	
+	this.form.site_id = option.site_id?Number(option.site_id):''
+	this.site_name = option.site_id?option.site_name:''
+	this.canSelectSite = option.site_id?true:false
+	// this.site_name = this.vuex_site?this.vuex_site.name:'全部' 
+	console.log("this.vuex_site",this.form.site_id,this.site_name)
+	
     uni.setNavigationBarTitle({
       title: option.type == 1 ? '预约陪诊' : '预约居家照护'
     })
-    this.getList(option.type);
-    this.getHospital(option.site_id);
 	if (!this.orderId && option.order_id) {
 	  this.orderId = option.order_id;
 	  this.getDetail();
 	}
+    this.getList(option.type,option.site_id);
+    this.getHospital(option.site_id);
+
     // 重置二维码显示状态
     this.showPayQrCode = false;
     this.payQrCode = '';
@@ -928,6 +967,9 @@ export default {
         page_size: 999,
       });
       this.list_service = res.data;
+	  if(!this.orderId){
+	  	this.list_psite = res.data.filter(item=>item.id==this.form.accompany_product_id)[0].site
+	  }
     },
     async getDetail(id) {
       console.log(id, this.orderId);
@@ -977,6 +1019,11 @@ export default {
     changeService(item) {
       this.info = item;
       this.form.accompany_product_id = item.id;
+	  if(this.canSelectSite){
+		  this.list_psite = item.site
+		  this.form.site_id = ''
+		  this.site_name = ''
+	  }
       this.getHospital(item.site_id);
       this.isShowService = false;
       this.form.hospital = "";
@@ -1011,6 +1058,10 @@ export default {
     confirmTime(e) {
       this.form.time = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:00`;
     },
+	confirmSite(e) {
+	  this.form.site_id = e[0].value;
+	  this.site_name = e[0].label;
+	},
     // 服务对象
     confirmArchive(e) {
       this.form.user_archive_id = e.id;

package_sub/pages/AddOrder/editOrder.vue

@@ -41,6 +41,14 @@
 
 				<u-form :model="form" :rules="rules" ref="uForm" :label-width="178" :error-type="['toast']">
 					<view class="form-card form-card-1">
+						<u-form-item label="站点区域" prop="site_id" required>
+						  <u-input
+						    type="input"
+						    placeholder="请选择站点区域"
+							:disabled="true"
+						    :value="site_name"
+						  />
+						</u-form-item>
 						<u-form-item label="就诊医院" prop="hospital" required v-if="form.type == 1">
 							<u-input :type="'select'" placeholder="请选择就诊医院" :value="hospital.name"
 								:select-open="isShowHospital" @click="isShowHospital = true" />
@@ -321,7 +329,7 @@
 
 				// service
 				isShowService: false,
-
+				site_name:'',
 				// form
 				fileList: [],
 				isShowHospital: false,
@@ -449,6 +457,7 @@
 							url: i.url
 						}))
 						this.paidPrice = res.price
+						this.site_name = res.site.name?res.site.name:''
 						uni.setNavigationBarTitle({
 							title: res.accompany_product ? res.accompany_product.name : '订单详情'
 						})

package_sub/pages/ServiceDetail/ServiceDetail.vue

@@ -99,6 +99,8 @@
 		data() {
 			return {
 				id: '',
+				choose_site:'',
+				site_name:'',
 				currentTab: 0,
 				info: {},
 				orderBtnStyle: {
@@ -116,6 +118,8 @@
 				title: option.title ?? "服务项目"
 			});
 			this.id = option.id ? option.id : ''
+			this.choose_site = option.choose_site?option.choose_site:''
+			this.site_name = option.site_name?option.site_name:''
 			this.getDetail(this.id)
 		},
 		mounted() {
@@ -157,7 +161,7 @@
 			  	return
 			  }
 			  this.$u.route({
-			    url: '/package_sub/pages/AddOrder/AddOrder?id='+info.id+'&site_id='+info.site_id+'&type='+info.type+'&can_multi_num='+info.can_multi_num
+			    url: '/package_sub/pages/AddOrder/AddOrder?id='+info.id+'&site_name='+this.site_name+'&site_id='+this.choose_site+'&type='+info.type+'&can_multi_num='+info.can_multi_num
 			  })
 			},
 		}

package_sub/pages/ServiceList/ServiceList.vue

@@ -163,7 +163,7 @@
 			},
 			toDetail(item) {
 				this.$u.route({
-					url: '/package_sub/pages/ServiceDetail/ServiceDetail?id=' + item.id
+					url: '/package_sub/pages/ServiceDetail/ServiceDetail?id=' + item.id+'&site_name='+this.site_name+'&choose_site='+this.select.site_id
 				})
 			}
 		},

unpackage/dist/dev/mp-weixin/package_sub/order/service.wxss

@@ -15,7 +15,6 @@
 /* uni.scss */
 .page.data-v-29bb77e4 {
   position: relative;
-  background-color: #f5efee;
   height: 100vh;
 }
 .box.data-v-29bb77e4 {

unpackage/dist/dev/mp-weixin/package_sub/pages/ServiceDetail/ServiceDetail.js

@@ -1,2 +1,2 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["package_sub/pages/ServiceDetail/ServiceDetail"],{300:function(e,n,t){"use strict";(function(e,n){var r=t(4);t(26);r(t(25));var i=r(t(301));e.__webpack_require_UNI_MP_PLUGIN__=t,n(i.default)}).call(this,t(1)["default"],t(2)["createPage"])},301:function(e,n,t){"use strict";t.r(n);var r=t(302),i=t(304);for(var u in i)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return i[e]}))}(u);t(306),t(308);var o,c=t(35),a=Object(c["default"])(i["default"],r["render"],r["staticRenderFns"],!1,null,"9eba20e8",null,!1,r["components"],o);a.options.__file="package_sub/pages/ServiceDetail/ServiceDetail.vue",n["default"]=a.exports},302:function(e,n,t){"use strict";t.r(n);var r=t(303);t.d(n,"render",(function(){return r["render"]})),t.d(n,"staticRenderFns",(function(){return r["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return r["recyclableRender"]})),t.d(n,"components",(function(){return r["components"]}))},303:function(e,n,t){"use strict";var r;t.r(n),t.d(n,"render",(function(){return i})),t.d(n,"staticRenderFns",(function(){return o})),t.d(n,"recyclableRender",(function(){return u})),t.d(n,"components",(function(){return r}));try{r={uSwiper:function(){return t.e("uview-ui/components/u-swiper/u-swiper").then(t.bind(null,429))},uParse:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-parse/u-parse")]).then(t.bind(null,436))},uButton:function(){return t.e("uview-ui/components/u-button/u-button").then(t.bind(null,345))}}}catch(c){if(-1===c.message.indexOf("Cannot find module")||-1===c.message.indexOf(".vue"))throw c;console.error(c.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var i=function(){var e=this,n=e.$createElement;e._self._c},u=!1,o=[];i._withStripped=!0},304:function(e,n,t){"use strict";t.r(n);var r=t(305),i=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(u);n["default"]=i.a},305:function(e,n,t){"use strict";(function(e){var r=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i=r(t(30)),u=r(t(32)),o={data:function(){return{id:"",currentTab:0,info:{},orderBtnStyle:{"background-image":"linear-gradient(-90deg, #e26165 0%, #c10d12 94%, #c10d12 100%)","font-weight":"500","font-size":"28rpx",color:"#fff",width:"436rpx","margin-top":"32rpx"}}},onLoad:function(n){var t;e.setNavigationBarTitle({title:null!==(t=n.title)&&void 0!==t?t:"服务项目"}),this.id=n.id?n.id:"",this.getDetail(this.id)},mounted:function(){},computed:{token:function(){var n;return this.vuex_token||(null===(n=e.getStorageSync("lifeData"))||void 0===n?void 0:n.vuex_token)}},methods:{getDetail:function(e){var n=this;return(0,u.default)(i.default.mark((function t(){return i.default.wrap((function(t){while(1)switch(t.prev=t.next){case 0:return t.next=2,n.$u.api.accompanyProductDetail({id:e}).then((function(e){console.log("res",e),n.info=e}));case 2:case"end":return t.stop()}}),t)})))()},toOrder:function(n){var t=this;this.token?this.$u.route({url:"/package_sub/pages/AddOrder/AddOrder?id="+n.id+"&site_id="+n.site_id+"&type="+n.type+"&can_multi_num="+n.can_multi_num}):e.showModal({title:"提示",content:"请先登录再下单",confirmText:"登录",success:function(e){e.confirm&&t.$u.route({url:"/pages/login/login",type:"redirect"})},fail:function(){}})}}};n.default=o}).call(this,t(2)["default"])},306:function(e,n,t){"use strict";t.r(n);var r=t(307),i=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(u);n["default"]=i.a},307:function(e,n,t){},308:function(e,n,t){"use strict";t.r(n);var r=t(309),i=t.n(r);for(var u in r)["default"].indexOf(u)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(u);n["default"]=i.a},309:function(e,n,t){}},[[300,"common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["package_sub/pages/ServiceDetail/ServiceDetail"],{300:function(e,n,t){"use strict";(function(e,n){var i=t(4);t(26);i(t(25));var r=i(t(301));e.__webpack_require_UNI_MP_PLUGIN__=t,n(r.default)}).call(this,t(1)["default"],t(2)["createPage"])},301:function(e,n,t){"use strict";t.r(n);var i=t(302),r=t(304);for(var o in r)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(o);t(306),t(308);var u,c=t(35),a=Object(c["default"])(r["default"],i["render"],i["staticRenderFns"],!1,null,"9eba20e8",null,!1,i["components"],u);a.options.__file="package_sub/pages/ServiceDetail/ServiceDetail.vue",n["default"]=a.exports},302:function(e,n,t){"use strict";t.r(n);var i=t(303);t.d(n,"render",(function(){return i["render"]})),t.d(n,"staticRenderFns",(function(){return i["staticRenderFns"]})),t.d(n,"recyclableRender",(function(){return i["recyclableRender"]})),t.d(n,"components",(function(){return i["components"]}))},303:function(e,n,t){"use strict";var i;t.r(n),t.d(n,"render",(function(){return r})),t.d(n,"staticRenderFns",(function(){return u})),t.d(n,"recyclableRender",(function(){return o})),t.d(n,"components",(function(){return i}));try{i={uSwiper:function(){return t.e("uview-ui/components/u-swiper/u-swiper").then(t.bind(null,429))},uParse:function(){return Promise.all([t.e("common/vendor"),t.e("uview-ui/components/u-parse/u-parse")]).then(t.bind(null,436))},uButton:function(){return t.e("uview-ui/components/u-button/u-button").then(t.bind(null,345))}}}catch(c){if(-1===c.message.indexOf("Cannot find module")||-1===c.message.indexOf(".vue"))throw c;console.error(c.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var r=function(){var e=this,n=e.$createElement;e._self._c},o=!1,u=[];r._withStripped=!0},304:function(e,n,t){"use strict";t.r(n);var i=t(305),r=t.n(i);for(var o in i)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return i[e]}))}(o);n["default"]=r.a},305:function(e,n,t){"use strict";(function(e){var i=t(4);Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r=i(t(30)),o=i(t(32)),u={data:function(){return{id:"",choose_site:"",site_name:"",currentTab:0,info:{},orderBtnStyle:{"background-image":"linear-gradient(-90deg, #e26165 0%, #c10d12 94%, #c10d12 100%)","font-weight":"500","font-size":"28rpx",color:"#fff",width:"436rpx","margin-top":"32rpx"}}},onLoad:function(n){var t;e.setNavigationBarTitle({title:null!==(t=n.title)&&void 0!==t?t:"服务项目"}),this.id=n.id?n.id:"",this.choose_site=n.choose_site?n.choose_site:"",this.site_name=n.site_name?n.site_name:"",this.getDetail(this.id)},mounted:function(){},computed:{token:function(){var n;return this.vuex_token||(null===(n=e.getStorageSync("lifeData"))||void 0===n?void 0:n.vuex_token)}},methods:{getDetail:function(e){var n=this;return(0,o.default)(r.default.mark((function t(){return r.default.wrap((function(t){while(1)switch(t.prev=t.next){case 0:return t.next=2,n.$u.api.accompanyProductDetail({id:e}).then((function(e){console.log("res",e),n.info=e}));case 2:case"end":return t.stop()}}),t)})))()},toOrder:function(n){var t=this;this.token?this.$u.route({url:"/package_sub/pages/AddOrder/AddOrder?id="+n.id+"&site_name="+this.site_name+"&site_id="+this.choose_site+"&type="+n.type+"&can_multi_num="+n.can_multi_num}):e.showModal({title:"提示",content:"请先登录再下单",confirmText:"登录",success:function(e){e.confirm&&t.$u.route({url:"/pages/login/login",type:"redirect"})},fail:function(){}})}}};n.default=u}).call(this,t(2)["default"])},306:function(e,n,t){"use strict";t.r(n);var i=t(307),r=t.n(i);for(var o in i)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return i[e]}))}(o);n["default"]=r.a},307:function(e,n,t){},308:function(e,n,t){"use strict";t.r(n);var i=t(309),r=t.n(i);for(var o in i)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return i[e]}))}(o);n["default"]=r.a},309:function(e,n,t){}},[[300,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/package_sub/pages/ServiceDetail/ServiceDetail.js.map