Commit 505e42a4bf948bdca3531b36fa4d90e6ac8eb7cd
1 parent
59610ed4
feat: 订货单-增加生产工艺字段(productionProcess),详情&审核详情-只读,通过一个字段判断是否展示(showProductionProc…
…ess),审核-可编辑,多行文本,通过一个字段判断是否展示(showProductionProcess)
Showing
3 changed files
with
29 additions
and
11 deletions
| @@ -44,7 +44,8 @@ | @@ -44,7 +44,8 @@ | ||
| 44 | 44 | ||
| 45 | <!-- 产品 --> | 45 | <!-- 产品 --> |
| 46 | <view class="section2"> | 46 | <view class="section2"> |
| 47 | - <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" :orderDate="form.orderDate" /> | 47 | + <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" |
| 48 | + :orderDate="form.orderDate" /> | ||
| 48 | </view> | 49 | </view> |
| 49 | 50 | ||
| 50 | <view class="section"> | 51 | <view class="section"> |
| @@ -170,8 +171,7 @@ | @@ -170,8 +171,7 @@ | ||
| 170 | 171 | ||
| 171 | <!-- 产品 --> | 172 | <!-- 产品 --> |
| 172 | <view class="mgb10"> | 173 | <view class="mgb10"> |
| 173 | - <Product mode="view" :list="form.purchaseOrderLineList" | ||
| 174 | - :totalQuantity="form.totalQuantity || 0" /> | 174 | + <Product mode="view" :list="form.purchaseOrderLineList" :totalQuantity="form.totalQuantity || 0" /> |
| 175 | </view> | 175 | </view> |
| 176 | 176 | ||
| 177 | <view class="section"> | 177 | <view class="section"> |
| @@ -181,7 +181,9 @@ | @@ -181,7 +181,9 @@ | ||
| 181 | <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view> | 181 | <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view> |
| 182 | <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD', | 182 | <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD', |
| 183 | form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view> | 183 | form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view> |
| 184 | - <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{ form.executionStandardRemarks }}</text></view> | 184 | + <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text |
| 185 | + class="value">{{ | ||
| 186 | + form.executionStandardRemarks }}</text></view> | ||
| 185 | </view> | 187 | </view> |
| 186 | 188 | ||
| 187 | <view class="title-header"> | 189 | <view class="title-header"> |
| @@ -198,7 +200,15 @@ | @@ -198,7 +200,15 @@ | ||
| 198 | <view class="row"><text class="label">包装</text><text class="value">{{ form.packaging }}</text></view> | 200 | <view class="row"><text class="label">包装</text><text class="value">{{ form.packaging }}</text></view> |
| 199 | <view class="row"><text class="label">备注</text><text class="value">{{ form.remarks }}</text></view> | 201 | <view class="row"><text class="label">备注</text><text class="value">{{ form.remarks }}</text></view> |
| 200 | </view> | 202 | </view> |
| 201 | - | 203 | + <!-- 品质科 可填写(不是办事处内勤) --> |
| 204 | + <uni-list v-if="form.showProductionProcess" > | ||
| 205 | + <uni-list-item title="生产工艺"> | ||
| 206 | + <template v-slot:footer> | ||
| 207 | + <uni-easyinput type="textarea" v-model="form.productionProcess" placeholder="请输入生产工艺" | ||
| 208 | + :inputBorder="false" /> | ||
| 209 | + </template> | ||
| 210 | + </uni-list-item> | ||
| 211 | + </uni-list> | ||
| 202 | </view> | 212 | </view> |
| 203 | </scroll-view> | 213 | </scroll-view> |
| 204 | 214 | ||
| @@ -411,7 +421,7 @@ export default { | @@ -411,7 +421,7 @@ export default { | ||
| 411 | 421 | ||
| 412 | &__container { | 422 | &__container { |
| 413 | padding: 32rpx; | 423 | padding: 32rpx; |
| 414 | - align-items: center; | 424 | + align-items: start !important; |
| 415 | 425 | ||
| 416 | .uni-easyinput { | 426 | .uni-easyinput { |
| 417 | 427 |
| @@ -13,7 +13,8 @@ | @@ -13,7 +13,8 @@ | ||
| 13 | </view> | 13 | </view> |
| 14 | <view class="row"><text class="label">订货日期</text><text class="value">{{ form.orderDate }}</text></view> | 14 | <view class="row"><text class="label">订货日期</text><text class="value">{{ form.orderDate }}</text></view> |
| 15 | <view class="row"><text class="label">生产厂</text><text class="value">{{ form.workshopName }}</text></view> | 15 | <view class="row"><text class="label">生产厂</text><text class="value">{{ form.workshopName }}</text></view> |
| 16 | - <view class="row"><text class="label">结算方式或期限</text><text class="value">{{ form.settlementTerms }}</text></view> | 16 | + <view class="row"><text class="label">结算方式或期限</text><text class="value">{{ form.settlementTerms }}</text> |
| 17 | + </view> | ||
| 17 | <view class="row"><text class="label">交货方式</text><text class="value">{{ form.deliveryMethod }}</text></view> | 18 | <view class="row"><text class="label">交货方式</text><text class="value">{{ form.deliveryMethod }}</text></view> |
| 18 | </view> | 19 | </view> |
| 19 | 20 | ||
| @@ -21,7 +22,7 @@ | @@ -21,7 +22,7 @@ | ||
| 21 | <view class="mgb10"> | 22 | <view class="mgb10"> |
| 22 | <Product mode="view" :list="form.purchaseOrderLineList" :totalQuantity="form.totalQuantity || 0" /> | 23 | <Product mode="view" :list="form.purchaseOrderLineList" :totalQuantity="form.totalQuantity || 0" /> |
| 23 | </view> | 24 | </view> |
| 24 | - | 25 | + |
| 25 | <view class="section"> | 26 | <view class="section"> |
| 26 | <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view> | 27 | <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view> |
| 27 | <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view> | 28 | <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view> |
| @@ -29,21 +30,26 @@ | @@ -29,21 +30,26 @@ | ||
| 29 | <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view> | 30 | <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view> |
| 30 | <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD', | 31 | <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD', |
| 31 | form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view> | 32 | form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view> |
| 32 | - <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{ form.executionStandardRemarks }}</text></view> | 33 | + <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text |
| 34 | + class="value">{{ form.executionStandardRemarks }}</text></view> | ||
| 33 | </view> | 35 | </view> |
| 34 | - | 36 | + |
| 35 | <view class="title-header"> | 37 | <view class="title-header"> |
| 36 | <image class="title-header_icon" src="/static/images/title.png" /> | 38 | <image class="title-header_icon" src="/static/images/title.png" /> |
| 37 | <span>具体质量要求</span> | 39 | <span>具体质量要求</span> |
| 38 | </view> | 40 | </view> |
| 39 | <view class="section"> | 41 | <view class="section"> |
| 40 | - <view class="row"><text class="label">件重条头</text><text class="value">{{ form.pieceWeightHeader }}</text></view> | 42 | + <view class="row"><text class="label">件重条头</text><text class="value">{{ form.pieceWeightHeader }}</text> |
| 43 | + </view> | ||
| 41 | <view class="row"><text class="label">表面</text><text class="value">{{ form.surface }}</text></view> | 44 | <view class="row"><text class="label">表面</text><text class="value">{{ form.surface }}</text></view> |
| 42 | <view class="row"><text class="label">公差</text><text class="value">{{ form.tolerance }}</text></view> | 45 | <view class="row"><text class="label">公差</text><text class="value">{{ form.tolerance }}</text></view> |
| 43 | <view class="row"><text class="label">性能</text><text class="value">{{ form.performance }}</text></view> | 46 | <view class="row"><text class="label">性能</text><text class="value">{{ form.performance }}</text></view> |
| 44 | <view class="row"><text class="label">成分</text><text class="value">{{ form.element }}</text></view> | 47 | <view class="row"><text class="label">成分</text><text class="value">{{ form.element }}</text></view> |
| 45 | <view class="row"><text class="label">包装</text><text class="value">{{ form.packaging }}</text></view> | 48 | <view class="row"><text class="label">包装</text><text class="value">{{ form.packaging }}</text></view> |
| 46 | <view class="row"><text class="label">备注</text><text class="value">{{ form.remarks }}</text></view> | 49 | <view class="row"><text class="label">备注</text><text class="value">{{ form.remarks }}</text></view> |
| 50 | + <!-- 品质科 可查看 --> | ||
| 51 | + <view v-if="form.showProductionProcess" class="row"><text class="label">生产工艺</text><text class="value">{{ | ||
| 52 | + form.productionProcess }}</text></view> | ||
| 47 | </view> | 53 | </view> |
| 48 | 54 | ||
| 49 | </view> | 55 | </view> |
| @@ -42,6 +42,8 @@ | @@ -42,6 +42,8 @@ | ||
| 42 | <view class="row"><text class="label">成分</text><text class="value">{{ form.element }}</text></view> | 42 | <view class="row"><text class="label">成分</text><text class="value">{{ form.element }}</text></view> |
| 43 | <view class="row"><text class="label">包装</text><text class="value">{{ form.packaging }}</text></view> | 43 | <view class="row"><text class="label">包装</text><text class="value">{{ form.packaging }}</text></view> |
| 44 | <view class="row"><text class="label">备注</text><text class="value">{{ form.remarks }}</text></view> | 44 | <view class="row"><text class="label">备注</text><text class="value">{{ form.remarks }}</text></view> |
| 45 | + <!-- 品质科 可查看 --> | ||
| 46 | + <view v-if="form.showProductionProcess" class="row"><text class="label">生产工艺</text><text class="value">{{ form.productionProcess }}</text></view> | ||
| 45 | </view> | 47 | </view> |
| 46 | 48 | ||
| 47 | </view> | 49 | </view> |