chenyue 3 роки тому
батько
коміт
ed13c6ba91

+ 22 - 0
mini-pro-web/package-lock.json

@ -4643,6 +4643,15 @@
        "safer-buffer": "^2.1.0"
      }
    },
    "echarts": {
      "version": "5.2.2",
      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.2.2.tgz",
      "integrity": "sha512-yxuBfeIH5c+0FsoRP60w4De6omXhA06c7eUYBsC1ykB6Ys2yK5fSteIYWvkJ4xJVLQgCvAdO8C4mN6MLeJpBaw==",
      "requires": {
        "tslib": "2.3.0",
        "zrender": "5.2.1"
      }
    },
    "ee-first": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@ -11406,6 +11415,11 @@
      "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
      "dev": true
    },
    "tslib": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
    },
    "tty-browserify": {
      "version": "0.0.0",
      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@ -12818,6 +12832,14 @@
      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
      "dev": true
    },
    "zrender": {
      "version": "5.2.1",
      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.2.1.tgz",
      "integrity": "sha512-M3bPGZuyLTNBC6LiNKXJwSCtglMp8XUEqEBG+2MdICDI3d1s500Y4P0CzldQGsqpRVB7fkvf3BKQQRxsEaTlsw==",
      "requires": {
        "tslib": "2.3.0"
      }
    }
  }
}

+ 1 - 0
mini-pro-web/package.json

@ -13,6 +13,7 @@
    "core-js": "^3.6.5",
    "crypto-js": "^4.0.0",
    "custom-components-mobile": "git+http://192.168.1.220:10080/lincl/custom-components-mobile.git#master",
    "echarts": "^5.2.2",
    "exif-js": "^2.3.0",
    "js-cookie": "^2.2.1",
    "lodash": "^4.17.20",

+ 1 - 1
mini-pro-web/public/index.html

@ -27,7 +27,7 @@
    <script src="<%= BASE_URL %>js/vconsole.min.js"></script>
    <script>
			// 初始化
			var vConsole = new VConsole();
			// var vConsole = new VConsole();
		</script> 
  </body>
</html>

+ 16 - 11
mini-pro-web/src/views/index/Index.vue

@ -137,6 +137,7 @@ export default {
  	data() {
    	return {
            medicineBag:'1',
            medicineData:false,
            prescriptionBag:'1',
            salesBag:'1',
            count:[],
@ -182,7 +183,7 @@ export default {
					userId: this.user.id
				})
				.then(res=>{
                    console.log('countall', res);
                    // console.log('countall', res);
                    this.overview = res.obj.overview;
                    this.maintain = res.obj.maintain;
				})
@ -199,10 +200,12 @@ export default {
				})
				.then(res=>{
                    console.log('medicine', res)
                    this.medicineData = true;
                    this.shippingType = res.obj;
				})
				.catch(err=>{
					console.error(err)
                    console.error(err)
                    this.medicineData = true;
				})
        },
        // 电子处方单
@ -222,16 +225,18 @@ export default {
        },
        // 取药时间查询
        medicineTime(val){
            if(val == '全部'){
                this.medicineBag = '';
                this.medicine();
                console.log('全部')
            }else{
                this.medicineBag = val;
            if(this.medicineData){
                if(val == '全部'){
                    this.medicineBag = '';
                    console.log('全部')
                }else{
                    this.medicineBag = val;
                    console.log('1,3,7,9')
                }
                this.medicineData = false;
                this.medicine();
                console.log('1,3,7,9')
                
            }
            
        },
        // 电子处方单查询
        prescriptionTime(val){
@ -263,7 +268,7 @@ export default {
                    day:this.salesBag
                })
                .then(res=>{
                    console.log('echartsData', res);
                    // console.log('echartsData', res);
                    this.amount = res.obj.amount;
                    this.count = res.obj.amountdateList.map((item) =>{
                        return item.count