Browse Source

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

ccj 2 năm trước cách đây
mục cha
commit
938851ed4a

+ 1 - 1
config/index.js

@@ -3,7 +3,7 @@ const dev = {
 	// baseUrl: 'http://localhost:8080/',
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
-	baseUrlNew: 'http://192.168.110.55:9100/',
+	baseUrlNew: 'http://192.168.110.55:9888/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',

+ 1 - 1
pages/task/audit/purchasecontract.vue

@@ -123,7 +123,7 @@
 			<view class="form_view">
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
-						<u-form-item label-width='150' label="货名" class="label_css" :borderBottom="false">
+						<u-form-item label-width='100' label="货名" class="label_css" :borderBottom="false">
 							<u-input v-model="list.contractGoodsInfo.goodsName" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>

+ 7 - 7
pages/task/audit/salecontract.vue

@@ -98,13 +98,19 @@
 			<u-form-item label-width='260' :borderBottom="false" label="双章原件回收情况" v-if="list.contractProcessInfo.grade">
 				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="--" disabled />
 			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="备注信息" v-if="list.contractProcessInfo.grade">
+			</u-form-item>
+			<!-- <view class="form_top">备注信息</view> -->
+			<u-form-item>
+				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="暂无备注信息" disabled />
+			</u-form-item>
 		</u-form>
 		<u-form ref="uForm">
 			<view class="form_top">货物信息</view>
 			<view class="form_view" style="background: #F9F9FA;">
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
-						<u-form-item label-width='150' :borderBottom="false" label="货名" class="label_css">
+						<u-form-item label-width='100' :borderBottom="false" label="货名" class="label_css">
 							<u-input v-model="list.contractGoodsInfo.goodsName" class="input_css" input-align="right" placeholder="--"
 								disabled />
 						</u-form-item>
@@ -218,12 +224,6 @@
 				</u-row>
 			</view>
 		</u-form>
-		<u-form ref="uForm">
-			<view class="form_top">备注信息</view>
-			<u-form-item>
-				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="暂无备注信息" disabled />
-			</u-form-item>
-		</u-form>
 		<u-form ref="uForm">
 			<view class="form_top">共{{imglist.length}}个附件</view>
 			<view v-if='imglist.length>0'>