ccj 2 년 전
부모
커밋
376c1691a5
4개의 변경된 파일57개의 추가작업 그리고 57개의 파일을 삭제
  1. 2 2
      config/index.js
  2. 2 2
      manifest.json
  3. 50 50
      pages/erpbusiness/add_quality_testing.vue
  4. 3 3
      pages/erpbusiness/customer.vue

+ 2 - 2
config/index.js

@@ -8,9 +8,9 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	 // baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
-	baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	// baseUrlNew: 'https://api2.eliangeyun.com/',
+	baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.127",
-    "versionCode" : 21127,
+    "versionName" : "2.1.129",
+    "versionCode" : 21129,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

+ 50 - 50
pages/erpbusiness/add_quality_testing.vue

@@ -6,14 +6,14 @@
 				<view class="title">类型</view>
 				<view class="con-list">
 					<u-radio-group @change="groupChange" v-model="typevalue">
-						<u-radio v-if="utils.getCurrectRoles('acquisitionQuality.initial')" key="1" label="贸易入库"
+						<u-radio v-show="utils.getCurrectRoles('acquisitionQuality.initial')" key="1" label="贸易入库"
 							name="1">贸易入库</u-radio>
-						<u-radio v-if="utils.getCurrectRoles('acquisitionQuality.qview')" key="3" label="收购入库" name="3">
+						<u-radio v-show="utils.getCurrectRoles('acquisitionQuality.qview')" key="3" label="收购入库" name="3">
 							收购入库</u-radio>
 					</u-radio-group>
 				</view>
 			</view>
-			<view v-if='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
+			<view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">仓库</view>
 				<view class="con-list">
 					{{gridList.warehouseName}}
@@ -28,63 +28,63 @@
 					</u-picker>
 				</view>
 			</view>
-			<view v-if='typevalue==1&&gridList.inOutType!="移库入库"||typevalue==3' class="c-row ">
+			<view v-show='typevalue==1&&gridList.inOutType!="移库入库"||typevalue==3' class="c-row ">
 				<view class="title">合同编号</view>
 				<view class="con-list">
 					{{gridList.contractNo?gridList.contractNo:'自动获取,不可编辑'}}
 				</view>
 			</view>
-			<view v-if='typevalue==1&&gridList.inOutType=="移库入库"' class="c-row ">
+			<view v-show='typevalue==1&&gridList.inOutType=="移库入库"' class="c-row ">
 				<view class="title">移库编号</view>
 				<view class="con-list">
 					{{gridList.contractNo?gridList.contractNo:'自动获取,不可编辑'}}
 				</view>
 			</view>
-			<!-- <view v-if='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
+			<!-- <view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">业务编号</view>
 				<view class="con-list">
 					{{gridList.qualityNo}}
 				</view>
 			</view> -->
-			<view v-if='typevalue==1' style=' align-items: flex-start;' class="c-row ">
+			<view v-show='typevalue==1' style=' align-items: flex-start;' class="c-row ">
 				<view class="title">提示</view>
 				<view class="con-list">
 					{{gridList.tips?gridList.tips:'自动获取,不可编辑'}}
 				</view>
 			</view>
-			<view v-if='typevalue==1' class="c-row ">
+			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">成本</view>
 				<view class="con-list">
-					<view v-if='!coststatus'>{{gridList.cost?gridList.cost:'自动获取,不可编辑'}}</view>
-					<view v-if='coststatus'>
+					<view v-show='!coststatus'>{{gridList.cost?gridList.cost:'自动获取,不可编辑'}}</view>
+					<view v-show='coststatus'>
 						<input v-model='gridList.cost' placeholder="请输入成本" name="input" type="digit"></input>
 					</view>
 				</view>
 				<button class='cu-btn bg-green shadow' @click="changecost">{{costtext}}</button>
 			</view>
-			<view v-if='typevalue==1' class="c-row ">
+			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">运费</view>
 				<view class="con-list flex">
-					<view v-if='!freightstatus'>{{gridList.freight?gridList.freight:'自动获取,不可编辑'}}</view>
-					<view v-if='freightstatus'>
+					<view v-show='!freightstatus'>{{gridList.freight?gridList.freight:'自动获取,不可编辑'}}</view>
+					<view v-show='freightstatus'>
 						<input v-model='gridList.freight' placeholder="请输入运费" name="input" type="digit"></input>
 					</view>
 				</view>
 				<button class='cu-btn bg-green shadow' @click="changefreight">{{freighttext}}</button>
 			</view>
-			<view v-if='typevalue==1' class="c-row ">
+			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">扣款</view>
 				<view class="con-list">
 					<input v-model='gridList.deductionAmount' placeholder="请输入扣款" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if='typevalue==1' class="c-row ">
+			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">入库类型</view>
 				<view class="con-list">
 					{{gridList.inOutType?gridList.inOutType:'自动获取,不可编辑'}}
 				</view>
 			</view>
-			<view v-if='typevalue==1' class="c-row ">
+			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">入库日期</view>
 				<view class="con-list">
 					<view @click='show5=true'>{{gridList.inOutDate?gridList.inOutDate:'请选择入库日期'}}</view>
@@ -93,7 +93,7 @@
 				</view>
 			</view>
 			<view
-				v-if='typevalue==1||typevalue==3&&gridList.outType=="自运"&&utils.getCurrectRoles("acquisitionQuality.initial")'
+				v-show='typevalue==1||typevalue==3&&gridList.outType=="自运"&&utils.getCurrectRoles("acquisitionQuality.initial")'
 				class="c-row ">
 				<view class="title">车队</view>
 				<view class="con-list">
@@ -103,7 +103,7 @@
 					</u-picker>
 				</view>
 			</view>
-			<view v-if='typevalue==1' class="c-row ">
+			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">运输方式</view>
 				<view class="con-list">
 					<view @click='show7=true'>{{gridList.outType?gridList.outType:'请选择运输方式'}}</view>
@@ -112,7 +112,7 @@
 					</u-picker>
 				</view>
 			</view>
-			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
+			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
 				<view class="title">运输方式</view>
 				<view class="con-list">
 					<view @click='show8=true'>{{outType?outType:'请选择运输方式'}}</view>
@@ -121,7 +121,7 @@
 					</u-picker>
 				</view>
 			</view>
-			<view v-if='typevalue==1' class="c-row ">
+			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list" v-show='gridList.inOutType!="移库入库"'>
 				<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard" :disabled="true"
@@ -137,61 +137,61 @@
 				
 				</view>
 			</view>
-			<view v-if="gridList.outType=='汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
+			<view v-show="gridList.outType=='汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
 				<view class="title">箱号-1</view>
 				<view class="con-list">
 					<input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="gridList.outType== '汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1"
+			<view v-show="gridList.outType== '汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1"
 				class="c-row ">
 				<view class="title">封号-1</view>
 				<view class="con-list">
 					<input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="gridList.outType=='汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
+			<view v-show="gridList.outType=='汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
 				<view class="title">箱号-2</view>
 				<view class="con-list">
 					<input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="gridList.outType== '汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1"
+			<view v-show="gridList.outType== '汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1"
 				class="c-row ">
 				<view class="title">封号-2</view>
 				<view class="con-list">
 					<input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="gridList.paramType != '1'&&utils.getCurrectRoles('acquisitionQuality.initial')" class="c-row ">
+			<view v-show="gridList.paramType != '1'&&utils.getCurrectRoles('acquisitionQuality.initial')" class="c-row ">
 				<view class="title">扣重比</view>
 				<view class="con-list">
 					<input v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")||typevalue==1' class="c-row ">
+			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")||typevalue==1' class="c-row ">
 				<view class="title">货名</view>
 				<view class="con-list">
 					<view>{{gridList.goodsName}}</view>
-					<!-- <view v-if='goodsdisabled'>{{gridList.goodsName}}</view> -->
-					<!-- <view v-if='!goodsdisabled' @click='show2=true'>{{gridList.goodsName}}</view> -->
+					<!-- <view v-show='goodsdisabled'>{{gridList.goodsName}}</view> -->
+					<!-- <view v-show='!goodsdisabled' @click='show2=true'>{{gridList.goodsName}}</view> -->
 					<u-picker :range="goodsList" range-key="goodsName" @confirm='goodspicker($event)' v-model="show2"
 						mode="selector">
 					</u-picker>
 				</view>
 			</view>
-			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
+			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
 				<view class="title">客户</view>
 				<view class="con-list">
-					<view @click='gocustomer' v-if='gridList.customerName'>
+					<view @click='gocustomer' v-show='gridList.customerName'>
 						{{gridList.customerName}}({{gridList.customerPhone}})
 					</view>
-					<view @click='gocustomer' v-else>
+					<view @click='gocustomer' v-show='!gridList.customerName'>
 						选择客户
 					</view>
 				</view>
 			</view>
-			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
+			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list" v-show='gridList.inOutType!="移库入库"'>
 					<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard" :disabled="true"
@@ -207,7 +207,7 @@
 				
 				</view>
 			</view>
-			<!-- <view v-if="gridList.paramType != '1'&&utils.getCurrectRoles('acquisitionQuality.initial')" class="c-row ">
+			<!-- <view v-show="gridList.paramType != '1'&&utils.getCurrectRoles('acquisitionQuality.initial')" class="c-row ">
 				<view class="title">扣重比</view>
 				<view class="con-list">
 					<input v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比" name="input" type="digit"></input>
@@ -222,13 +222,13 @@
 						name="input" type="digit"></input>
 				</view>
 			</view> -->
-			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
+			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">购粮性质</view>
 				<view class="con-list">
 					<input v-model='gridList.natureOfGrainPurchase' placeholder="请输入购粮性质" name="input"></input>
 				</view>
 			</view>
-			<view v-if='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
+			<view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">仓位号</view>
 				<view class="con-list">
 					<view @click='show=true'>{{gridList.binNumber?gridList.binNumber:'请选择仓位号'}}</view>
@@ -237,22 +237,22 @@
 					</u-picker>
 				</view>
 			</view>
-			<view v-if='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
+			<view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">囤位号</view>
 				<view class="con-list">
 					<input type="digit" v-model='gridList.storageTagNo' placeholder="请输入囤位号" name="input"></input>
 				</view>
 			</view>
-			<view v-if='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
+			<view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">类型</view>
-				<view v-if="!edit" class="con-list">
+				<view v-show="!edit" class="con-list">
 					<view @click='show3=true'>{{gridList.type?gridList.type:'请选择类型'}}</view>
 					<u-picker :range="typeList" @confirm='typepicker($event)' v-model="show3" mode="selector">
 					</u-picker>
 				</view>
-				<view v-else class="con-list">{{gridList.type?gridList.type:'请选择类型'}}</view>
+				<view  v-show="edit" class="con-list">{{gridList.type?gridList.type:'请选择类型'}}</view>
 			</view>
-			<view v-if="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
+			<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
 				class="c-row">
 				<view class="title">净重单价(元/公斤)</view>
 				<view class="con-list">
@@ -261,7 +261,7 @@
 				</view>
 				<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
 			</view>
-			<view v-if="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
+			<view v-show="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
 				class="c-row">
 				<view class="title">干粮单价(元/公斤)</view>
 				<view class="con-list">
@@ -270,7 +270,7 @@
 				</view>
 				<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
 			</view>
-			<view v-if="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
+			<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
 				class="c-row">
 				<view class="title">净重单价(元/公斤)</view>
 				<view class="con-list">
@@ -278,7 +278,7 @@
 						placeholder="自动获取,不可编辑" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
+			<view v-show="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
 				class="c-row">
 				<view class="title">干粮单价(元/公斤)</view>
 				<view class="con-list">
@@ -286,32 +286,32 @@
 						placeholder="请输入干粮单价" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
 				<view class="title">箱号-1</view>
 				<view class="con-list">
 					<input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
 				<view class="title">封号-1</view>
 				<view class="con-list">
 					<input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
 				<view class="title">箱号-2</view>
 				<view class="con-list">
 					<input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
 				<view class="title">封号-2</view>
 				<view class="con-list">
 					<input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
 		</view>
-		<view v-if="utils.getCurrectRoles('acquisitionQuality.initial')" style='padding-bottom:300rpx;'>
+		<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')" style='padding-bottom:300rpx;'>
 			<view class='wrap'>
 				<view style='margin-right:10px;' class='flex justify-between align-item-center'>
 					<view class='title_b'>化验信息</view>
@@ -337,8 +337,8 @@
 					</view>
 				</view>
 				<view class="c-row ">
-					<view v-if='gridList.goodsName!="大豆"' class="title">容重(克/升)</view>
-					<view v-else class="title">蛋白</view>
+					<view v-show='gridList.goodsName!="大豆"' class="title">容重(克/升)</view>
+					<view v-show='gridList.goodsName=="大豆"' class="title">蛋白</view>
 					<view class="con-list">
 						<input v-model='gridList.bulkDensity' placeholder="请输入容重" name="input" type="digit" @input="obtainPrice"></input>
 					</view>

+ 3 - 3
pages/erpbusiness/customer.vue

@@ -18,13 +18,13 @@
 
 			<view v-for='item in gridList'>
 				<view v-if='searchKeyWord.length>0&&show==true' class='searchwrap' @click='checkcustomer(item)'>
-					<view v-if="item.supplier"> {{item.customerName}}({{item.customerPhone}})-{{item.supplier}} </view>
-					<view v-else> {{item.customerName}}({{item.customerPhone}}) </view>
+					<view v-if="item.supplier"> {{item.customerName}}({{item.bankCard}})-{{item.supplier}} </view>
+					<view v-else> {{item.customerName}}({{item.bankCard}}) </view>
 				</view>
 			</view>
 			<view v-for='item in recentCustomers' style='display:inline-block;'>
 				<view @click='recentcustomer(item)' class='wrap' v-if='show==false'>
-					{{item.customerName}}({{item.customerPhone}})
+					{{item.customerName}}({{item.bankCard}})
 				</view>
 			</view>
 		</view>