gjy 3 anni fa
parent
commit
ea012a77dd
3 ha cambiato i file con 155 aggiunte e 91 eliminazioni
  1. 73 73
      pages/erp/index.vue
  2. 3 2
      pages/erpbusiness/add_quality_testing.vue
  3. 79 16
      pages/user/user.vue

+ 73 - 73
pages/erp/index.vue

@@ -52,7 +52,7 @@
 				</view>
 			</view>
 		</view>
-		<view>
+		<!-- <view>
 			<view class='title'>常用功能</view>
 			<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']" v-if="isShowBtn">
 				<view class="cu-item" v-for="(item,index) in gridList2" :key="index" @click="gridClick(item, index)"
@@ -64,7 +64,7 @@
 					<text>{{item.name}}</text>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='立即开通'
 			title='您尚未开通ERP业务' showCancelButton='false' :content="content" @confirm="goOpenService"
@@ -139,78 +139,78 @@
 									// }
 								],
 				gridList: [
-					// {
-					// 	num: 0,
-					// 	name: '入库',
-					// 	// icon: 'cuIcon-apps',
-					// 	src: '../../static/img/erp/yaoqingyonghu@3x.png',
-					// 	tips: 0,
-					// 	url: '/pages/erp/warehousing/warehousing',
-					// 	show: true
-					// },
-					// {
-					// 	num: 1,
-					// 	name: '待完善入库',
-					// 	// icon: 'cuIcon-calendar',
-					// 	src: '../../static/img/erp/shougouzhijian@3x.png',
-					// 	tips: 0,
-					// 	url: '/pages/erp/improvedWrehousing/improvedWrehousing',
-					// 	show: true
-					// },
-					// {
-					// 	num: 2,
-					// 	name: '出库',
-					// 	// icon: 'cuIcon-copy',
-					// 	src: '../../static/img/erp/shougoujianjin@3x.png',
-					// 	tips: 0,
-					// 	url: '/pages/erp/exWarehousing/exWarehousing',
-					// 	show: true
-					// },
-					// {
-					// 	num: 3,
-					// 	name: '待完善出库',
-					// 	// icon: 'cuIcon-edit',
-					// 	src: '../../static/img/erp/shougouzhijian@3x.png',
-					// 	tips: 0,
-					// 	url: `/pages/erp/improvedExWaehousing/improvedExWaehousing`,
-					// 	show: true
-					// }
 					{
-							num: 0,
-							name: '入库质检',
-							// icon: 'cuIcon-apps',
-							src: '../../static/img/erp/yaoqingyonghu@3x.png',
-							tips: 0,
-							url: '/pages/erpbusiness/quality_testing?managementType=1',
-							show: true
-						},
-						{
-							num: 1,
-							name: '入库检斤',
-							// icon: 'cuIcon-calendar',
-							src: '../../static/img/erp/shougouzhijian@3x.png',
-							tips: 0,
-							url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
-							show: true
-						},
-						{
-							num: 2,
-							name: '出库检斤',
-							// icon: 'cuIcon-copy',
-							src: '../../static/img/erp/shougoujianjin@3x.png',
-							tips: 0,
-							url: '/pages/warehouse/acquisitionInspection/acquisitionInspection',
-							show: true
-						},
-						{
-							num: 3,
-							name: '出库质检',
-							// icon: 'cuIcon-edit',
-							src: '../../static/img/erp/shougouzhijian@3x.png',
-							tips: 0,
-							url: `/pages/warehouse/quality_testing?managementType=1`,
-							show: true
-						}
+						num: 0,
+						name: '入库',
+						// icon: 'cuIcon-apps',
+						src: '../../static/img/erp/yaoqingyonghu@3x.png',
+						tips: 0,
+						url: '/pages/erp/warehousing/warehousing',
+						show: true
+					},
+					{
+						num: 1,
+						name: '待完善入库',
+						// icon: 'cuIcon-calendar',
+						src: '../../static/img/erp/shougouzhijian@3x.png',
+						tips: 0,
+						url: '/pages/erp/improvedWrehousing/improvedWrehousing',
+						show: true
+					},
+					{
+						num: 2,
+						name: '出库',
+						// icon: 'cuIcon-copy',
+						src: '../../static/img/erp/shougoujianjin@3x.png',
+						tips: 0,
+						url: '/pages/erp/exWarehousing/exWarehousing',
+						show: true
+					},
+					{
+						num: 3,
+						name: '待完善出库',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/erp/shougouzhijian@3x.png',
+						tips: 0,
+						url: `/pages/erp/improvedExWaehousing/improvedExWaehousing`,
+						show: true
+					}
+					// {
+					// 		num: 0,
+					// 		name: '入库质检',
+					// 		// icon: 'cuIcon-apps',
+					// 		src: '../../static/img/erp/yaoqingyonghu@3x.png',
+					// 		tips: 0,
+					// 		url: '/pages/erpbusiness/quality_testing?managementType=1',
+					// 		show: true
+					// 	},
+					// 	{
+					// 		num: 1,
+					// 		name: '入库检斤',
+					// 		// icon: 'cuIcon-calendar',
+					// 		src: '../../static/img/erp/shougouzhijian@3x.png',
+					// 		tips: 0,
+					// 		url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
+					// 		show: true
+					// 	},
+					// 	{
+					// 		num: 2,
+					// 		name: '出库检斤',
+					// 		// icon: 'cuIcon-copy',
+					// 		src: '../../static/img/erp/shougoujianjin@3x.png',
+					// 		tips: 0,
+					// 		url: '/pages/erpbusiness/acquisitionInspection/warehouseWeighing',
+					// 		show: true
+					// 	},
+						// {
+						// 	num: 3,
+						// 	name: '出库质检',
+						// 	// icon: 'cuIcon-edit',
+						// 	src: '../../static/img/erp/shougouzhijian@3x.png',
+						// 	tips: 0,
+						// 	url: `/pages/erpbusiness/quality_testing?managementType=1`,
+						// 	show: true
+						// }
 					// {
 					// 	num: 4,
 					// 	name: '开通业务',

+ 3 - 2
pages/erpbusiness/add_quality_testing.vue

@@ -679,7 +679,8 @@
 		},
 		methods: {
 			changeprice(){
-				if(this.pricetext='解锁'){
+				console.log(this.pricetext)
+				if(this.pricetext=='解锁'){
 					this.pricedisabled=false
 					this.pricetext='锁定'
 				}else{
@@ -688,7 +689,7 @@
 				}
 			},
 			inputprice(){
-				if(this.pricetext='锁定'){
+				if(this.pricetext=='锁定'){
 					this.pricedisabled=true
 					
 					this.pricetext='解锁'

+ 79 - 16
pages/user/user.vue

@@ -175,18 +175,18 @@
 						url: `/pages/erp/index`,
 						show: true
 					},
-					// {
-					// 	num: 1,
-					// 	name: '入库管理',
-					// 	// name: '收购业务',
-					// 	// icon: 'cuIcon-copy',
-					// 	src: '../../static/img/myimg/sg.png',
-					// 	tips: 0,
-					// 	url: `/pages/erpbusiness/index`,
-					// 	show: true
-					// },
 					{
 						num: 1,
+						name: '入库管理',
+						// name: '收购业务',
+						// icon: 'cuIcon-copy',
+						src: '../../static/img/myimg/sg.png',
+						tips: 0,
+						url: `/pages/erpbusiness/index`,
+						show: true
+					},
+					{
+						num: 2,
 						name: '我的票据',
 						// icon: 'cuIcon-news',
 						src: '../../static/img/sign/piaoju@3x.png',
@@ -195,7 +195,7 @@
 						show: true
 					},
 					{
-						num: 2,
+						num: 3,
 						name: '我的合同',
 						// icon: 'cuIcon-calendar',
 						src: '../../static/img/sign/myContract@2x.png',
@@ -204,7 +204,7 @@
 						show: true
 					},
 					{
-						num: 3,
+						num: 4,
 						name: '我的任务',
 						// icon: 'cuIcon-copy',
 						src: '../../static/img/sign/myTask@2x.png',
@@ -213,7 +213,7 @@
 						show: true
 					},
 					{
-						num: 4,
+						num: 5,
 						name: '联系客服',
 						// icon: 'cuIcon-edit',
 						src: '../../static/img/sign/service.png',
@@ -222,7 +222,7 @@
 						show: true
 					},
 					{
-						num: 5,
+						num: 6,
 						name: '数据报表',
 						// icon: 'cuIcon-edit',
 						src: '../../static/img/sign/shujubaobiao@2x.png',
@@ -231,7 +231,7 @@
 						show: false
 					},
 					{
-						num: 6,
+						num: 7,
 						name: '库点监控',
 						// icon: 'cuIcon-edit',
 						src: '../../static/img/sign/kudianjiankong@2x.png',
@@ -240,7 +240,7 @@
 						show: false
 					},
 					{
-						num: 7,
+						num: 8,
 						name: '库点收购',
 						// icon: 'cuIcon-edit',
 						src: '../../static/img/sign/kdsg.png',
@@ -248,6 +248,69 @@
 						url: `/pages/user/depotAcquisition/depotAcquisition`,
 						show: true
 					}
+					// {
+					// 	num: 1,
+					// 	name: '我的票据',
+					// 	// icon: 'cuIcon-news',
+					// 	src: '../../static/img/sign/piaoju@3x.png',
+					// 	tips: 0,
+					// 	url: `/pages/bill/index`,
+					// 	show: true
+					// },
+					// {
+					// 	num: 2,
+					// 	name: '我的合同',
+					// 	// icon: 'cuIcon-calendar',
+					// 	src: '../../static/img/sign/myContract@2x.png',
+					// 	tips: 0,
+					// 	url: '/pageB/contract/contract',
+					// 	show: true
+					// },
+					// {
+					// 	num: 3,
+					// 	name: '我的任务',
+					// 	// icon: 'cuIcon-copy',
+					// 	src: '../../static/img/sign/myTask@2x.png',
+					// 	tips: 0,
+					// 	url: '/pages/task/my_task',
+					// 	show: true
+					// },
+					// {
+					// 	num: 4,
+					// 	name: '联系客服',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/sign/service.png',
+					// 	tips: 0,
+					// 	url: `/pages/erp/contactCustomerService/contactCustomerService`,
+					// 	show: true
+					// },
+					// {
+					// 	num: 5,
+					// 	name: '数据报表',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/sign/shujubaobiao@2x.png',
+					// 	tips: 0,
+					// 	url: `/pages/user/report`,
+					// 	show: false
+					// },
+					// {
+					// 	num: 6,
+					// 	name: '库点监控',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/sign/kudianjiankong@2x.png',
+					// 	tips: 0,
+					// 	url: `/pages/user/depotMonitoring`,
+					// 	show: false
+					// },
+					// {
+					// 	num: 7,
+					// 	name: '库点收购',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/sign/kdsg.png',
+					// 	tips: 0,
+					// 	url: `/pages/user/depotAcquisition/depotAcquisition`,
+					// 	show: true
+					// }
 				],
 				showTran: true,
 				companyId: 1,