朱园亮 / erp-mobile · Commits

Commit 8d1e5c532ce53f1b1dd45e287805edc4097fec68

Authored by 严涛
1 parent f771c609

合同模块添加物料编码

Inline Side-by-side
Showing 12 changed files with 80 additions and 8 deletions
... ... @@ -102,6 +102,11 @@
102 102 placeholder="请输入长度公差(单项-)" />
103 103 </template>
104 104 </uni-list-item>
  105 + <uni-list-item title="物料编码">
  106 + <template v-slot:footer>
  107 + <uni-easyinput v-model="item.materialCode" :inputBorder="false" placeholder="请输入物料编码" />
  108 + </template>
  109 + </uni-list-item>
105 110 <uni-list-item title="状态">
106 111 <template v-slot:footer>
107 112 <uni-easyinput v-model="item.status" :inputBorder="false" placeholder="请输入状态" />
... ... @@ -179,6 +184,7 @@
179 184 </view>
180 185 </view>
181 186 </view>
  187 + <view class="row"><text class="label">物料编码</text><text class="value">{{ item.materialCode }}</text></view>
182 188 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
183 189 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
184 190 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
... ... @@ -246,7 +252,7 @@ export default {
246 252 },
247 253 methods: {
248 254 defaultItem() {
249   - return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
  255 + return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
250 256 },
251 257 onImmediateChange(idx) {
252 258 this.$nextTick(() => this.recalculate(idx))
... ...
... ... @@ -102,6 +102,11 @@
102 102 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
103 103 </template>
104 104 </uni-list-item>
  105 + <uni-list-item title="物料编码">
  106 + <template v-slot:footer>
  107 + <uni-easyinput v-model="item.materialCode" :inputBorder="false" placeholder="请输入物料编码" />
  108 + </template>
  109 + </uni-list-item>
105 110 <uni-list-item title="状态">
106 111 <template v-slot:footer>
107 112 <uni-easyinput v-model="item.status" :inputBorder="false" placeholder="请输入状态" />
... ... @@ -190,6 +195,7 @@
190 195 </view>
191 196 </view>
192 197 </view>
  198 + <view class="row"><text class="label">物料编码</text><text class="value">{{ item.materialCode }}</text></view>
193 199 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
194 200 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
195 201 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
... ... @@ -271,7 +277,7 @@ export default {
271 277 },
272 278 methods: {
273 279 defaultItem() {
274   - return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', processingFee: undefined, totalAmount: 0, deliveryDate: '', sampleOrder: false }
  280 + return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', processingFee: undefined, totalAmount: 0, deliveryDate: '', sampleOrder: false }
275 281 },
276 282 onNonNegativeInput(idx, field) {
277 283 const it = this.items[idx]
... ...
... ... @@ -74,6 +74,11 @@
74 74 </view>
75 75 </template>
76 76 </uni-list-item>
  77 + <uni-list-item title="物料编码">
  78 + <template v-slot:footer>
  79 + <uni-easyinput v-model="item.materialCode" placeholder="请输入物料编码" :clearable="false" disabled />
  80 + </template>
  81 + </uni-list-item>
77 82 <uni-list-item title="状态">
78 83 <template v-slot:footer>
79 84 <uni-easyinput v-model="item.status" placeholder="请输入状态" :clearable="false" disabled />
... ... @@ -248,6 +253,7 @@ export default {
248 253 length: v.length || '',
249 254 lengthTolPos: v.lengthTolPos || '',
250 255 lengthTolNeg: v.lengthTolNeg || '',
  256 + materialCode: v.materialCode || '',
251 257 status: v.status || '',
252 258 quantity: v.productQuantity || v.quantity || '',
253 259 unitPrice: v.unitPrice || '',
... ...
... ... @@ -104,6 +104,11 @@
104 104 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
105 105 </template>
106 106 </uni-list-item>
  107 + <uni-list-item title="物料编码">
  108 + <template v-slot:footer>
  109 + <uni-easyinput v-model="item.materialCode" :inputBorder="false" placeholder="请输入物料编码" />
  110 + </template>
  111 + </uni-list-item>
107 112 <uni-list-item title="状态">
108 113 <template v-slot:footer>
109 114 <uni-easyinput v-model="item.status" :inputBorder="false" placeholder="请输入状态" />
... ... @@ -192,6 +197,7 @@
192 197 </view>
193 198 </view>
194 199 </view>
  200 + <view class="row"><text class="label">物料编码</text><text class="value">{{ item.materialCode }}</text></view>
195 201 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
196 202 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
197 203 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
... ... @@ -273,7 +279,7 @@ export default {
273 279 },
274 280 methods: {
275 281 defaultItem() {
276   - return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', processingFee: undefined, totalAmount: 0, deliveryDate: '', sampleOrder: false }
  282 + return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', processingFee: undefined, totalAmount: 0, deliveryDate: '', sampleOrder: false }
277 283 },
278 284 onNonNegativeInput(idx, field) {
279 285 const it = this.items[idx]
... ...
... ... @@ -73,6 +73,11 @@
73 73 </view>
74 74 </template>
75 75 </uni-list-item>
  76 + <uni-list-item title="物料编码">
  77 + <template v-slot:footer>
  78 + <uni-easyinput v-model="item.materialCode" placeholder="请输入物料编码" :clearable="false" disabled />
  79 + </template>
  80 + </uni-list-item>
76 81 <uni-list-item title="状态">
77 82 <template v-slot:footer>
78 83 <uni-easyinput v-model="item.status" placeholder="请输入状态" :clearable="false" disabled />
... ... @@ -246,6 +251,7 @@ export default {
246 251 length: v.length || '',
247 252 lengthTolPos: v.lengthTolPos || '',
248 253 lengthTolNeg: v.lengthTolNeg || '',
  254 + materialCode: v.materialCode || '',
249 255 status: v.status || '',
250 256 quantity: v.productQuantity || v.quantity || '',
251 257 unitPrice: v.unitPrice || '',
... ...
... ... @@ -102,6 +102,11 @@
102 102 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
103 103 </template>
104 104 </uni-list-item>
  105 + <uni-list-item title="物料编码">
  106 + <template v-slot:footer>
  107 + <uni-easyinput v-model="item.materialCode" :inputBorder="false" placeholder="请输入物料编码" />
  108 + </template>
  109 + </uni-list-item>
105 110 <uni-list-item title="状态">
106 111 <template v-slot:footer>
107 112 <uni-easyinput v-model="item.status" :inputBorder="false" placeholder="请输入状态" />
... ... @@ -186,6 +191,7 @@
186 191 </view>
187 192 </view>
188 193 </view>
  194 + <view class="row"><text class="label">物料编码</text><text class="value">{{ item.materialCode }}</text></view>
189 195 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
190 196 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
191 197 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
... ... @@ -267,7 +273,7 @@ export default {
267 273 },
268 274 methods: {
269 275 defaultItem() {
270   - return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', totalAmount: 0, deliveryDate: '', sampleOrder: false }
  276 + return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', totalAmount: 0, deliveryDate: '', sampleOrder: false }
271 277 },
272 278 onNonNegativeInput(idx, field) {
273 279 const it = this.items[idx]
... ...
... ... @@ -134,6 +134,11 @@
134 134 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
135 135 </template>
136 136 </uni-list-item>
  137 + <uni-list-item title="物料编码">
  138 + <template v-slot:footer>
  139 + <uni-easyinput v-model="item.materialCode" :inputBorder="false" placeholder="请输入物料编码" />
  140 + </template>
  141 + </uni-list-item>
137 142 <uni-list-item title="定作物数量">
138 143 <template v-slot:footer>
139 144 <uni-easyinput v-model="item.productQuantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'productQuantity')" @blur="onNonNegativeBlur(idx, 'productQuantity', 2)" />
... ... @@ -214,6 +219,7 @@
214 219 </view>
215 220 </view>
216 221 </view>
  222 + <view class="row"><text class="label">物料编码</text><text class="value">{{ item.materialCode }}</text></view>
217 223 <view class="row"><text class="label">定做物数量</text><text class="value">{{ item.productQuantity }}</text></view>
218 224 <view class="row"><text class="label">加工费单价</text><text class="value">{{ formatCurrency(item.unitPrice)
219 225 }}</text>
... ... @@ -310,7 +316,7 @@ export default {
310 316 },
311 317 methods: {
312 318 defaultItem() {
313   - return { rawProductId: '', rawProductName: '', rawProductGradeId: '', rawProductGradeName: '', industry: '', quality: '', supplyTime: '', materialProductRatio: '', materialProductRatioName: '', materialProductRatioRemarks: '', productName: '', productId: '', productGrade: '', productStatus: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', productQuantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
  319 + return { rawProductId: '', rawProductName: '', rawProductGradeId: '', rawProductGradeName: '', industry: '', quality: '', supplyTime: '', materialProductRatio: '', materialProductRatioName: '', materialProductRatioRemarks: '', productName: '', productId: '', productGrade: '', productStatus: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode:'', productQuantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
314 320 },
315 321 onNumberInput(idx, field) {
316 322 const it = this.items[idx]
... ...
... ... @@ -102,6 +102,11 @@
102 102 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
103 103 </template>
104 104 </uni-list-item>
  105 + <uni-list-item title="物料编码">
  106 + <template v-slot:footer>
  107 + <uni-easyinput v-model="item.materialCode" :inputBorder="false" placeholder="请输入物料编码" />
  108 + </template>
  109 + </uni-list-item>
105 110 <uni-list-item title="状态">
106 111 <template v-slot:footer>
107 112 <uni-easyinput v-model="item.status" :inputBorder="false" placeholder="请输入状态" />
... ... @@ -185,6 +190,7 @@
185 190 </view>
186 191 </view>
187 192 </view>
  193 + <view class="row"><text class="label">物料编码</text><text class="value">{{ item.materialCode }}</text></view>
188 194 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
189 195 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
190 196 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
... ... @@ -266,7 +272,7 @@ export default {
266 272 },
267 273 methods: {
268 274 defaultItem() {
269   - return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
  275 + return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
270 276 },
271 277 onNumberInput(idx, field) {
272 278 const it = this.items[idx]
... ...
... ... @@ -69,6 +69,11 @@
69 69 </view>
70 70 </template>
71 71 </uni-list-item>
  72 + <uni-list-item title="物料编码">
  73 + <template v-slot:footer>
  74 + <uni-easyinput v-model="item.materialCode" placeholder="请输入物料编码" :clearable="false" disabled />
  75 + </template>
  76 + </uni-list-item>
72 77 <uni-list-item title="状态">
73 78 <template v-slot:footer>
74 79 <uni-easyinput v-model="item.status" placeholder="请输入状态" :clearable="false" disabled />
... ... @@ -235,6 +240,7 @@ export default {
235 240 length: v.length || '',
236 241 lengthTolPos: v.lengthTolPos || '',
237 242 lengthTolNeg: v.lengthTolNeg || '',
  243 + materialCode: v.materialCode || '',
238 244 status: v.status || '',
239 245 quantity: v.productQuantity || v.quantity || '',
240 246 unitPrice: v.unitPrice || '',
... ...
... ... @@ -102,6 +102,11 @@
102 102 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
103 103 </template>
104 104 </uni-list-item>
  105 + <uni-list-item title="物料编码">
  106 + <template v-slot:footer>
  107 + <uni-easyinput v-model="item.materialCode" :inputBorder="false" placeholder="请输入物料编码" />
  108 + </template>
  109 + </uni-list-item>
105 110 <uni-list-item title="状态">
106 111 <template v-slot:footer>
107 112 <uni-easyinput v-model="item.status" :inputBorder="false" placeholder="请输入状态" />
... ... @@ -185,6 +190,7 @@
185 190 </view>
186 191 </view>
187 192 </view>
  193 + <view class="row"><text class="label">物料编码</text><text class="value">{{ item.materialCode }}</text></view>
188 194 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
189 195 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
190 196 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
... ... @@ -371,7 +377,7 @@ export default {
371 377 return true
372 378 },
373 379 defaultItem() {
374   - return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
  380 + return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
375 381 },
376 382 onNonNegativeInput(idx, field) {
377 383 const it = this.items[idx]
... ...
... ... @@ -68,6 +68,11 @@
68 68 </view>
69 69 </template>
70 70 </uni-list-item>
  71 + <uni-list-item title="物料编码">
  72 + <template v-slot:footer>
  73 + <uni-easyinput v-model="item.materialCode" placeholder="请输入物料编码" :clearable="false" disabled />
  74 + </template>
  75 + </uni-list-item>
71 76 <uni-list-item title="状态">
72 77 <template v-slot:footer>
73 78 <uni-easyinput v-model="item.status" placeholder="请输入状态" :clearable="false" disabled />
... ... @@ -233,6 +238,7 @@ export default {
233 238 length: v.length || '',
234 239 lengthTolPos: v.lengthTolPos || '',
235 240 lengthTolNeg: v.lengthTolNeg || '',
  241 + materialCode: v.materialCode || '',
236 242 status: v.status || '',
237 243 quantity: v.productQuantity || v.quantity || '',
238 244 unitPrice: v.unitPrice || '',
... ...
... ... @@ -102,6 +102,11 @@
102 102 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
103 103 </template>
104 104 </uni-list-item>
  105 + <uni-list-item title="物料编码">
  106 + <template v-slot:footer>
  107 + <uni-easyinput v-model="item.materialCode" :inputBorder="false" placeholder="请输入物料编码" />
  108 + </template>
  109 + </uni-list-item>
105 110 <uni-list-item title="状态">
106 111 <template v-slot:footer>
107 112 <uni-easyinput v-model="item.status" :inputBorder="false" placeholder="请输入状态" />
... ... @@ -185,6 +190,7 @@
185 190 </view>
186 191 </view>
187 192 </view>
  193 + <view class="row"><text class="label">物料编码</text><text class="value">{{ item.materialCode }}</text></view>
188 194 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
189 195 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
190 196 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
... ... @@ -266,7 +272,7 @@ export default {
266 272 },
267 273 methods: {
268 274 defaultItem() {
269   - return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
  275 + return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
270 276 },
271 277 onNonNegativeInput(idx, field) {
272 278 const it = this.items[idx]
... ...