朱园亮 / erp-mobile · Commits

Commit f961d2331446ff6d65be3dde7862d95d69392ebe

Authored by gesilong
1 parent 78e15624

commit：修复业务员 计划员对订单修改内容

Inline Side-by-side
Showing 3 changed files with 74 additions and 39 deletions
... ... @@ -71,12 +71,12 @@
71 71 <view class="section">
72 72 <uni-list-item title="价格表编号">
73 73 <template v-slot:footer>
74   - <uni-easyinput v-model="form.priceListNo" placeholder="请输入价格表编号" :inputBorder="false" :disabled="canEditQualityFields"/>
  74 + <uni-easyinput v-model="form.priceListNo" placeholder="请输入价格表编号" :inputBorder="false" :disabled="!roleCodes.includes('bscnq') && canEditQualityFields"/>
75 75 </template>
76 76 </uni-list-item>
77 77 <uni-list-item title="开票要求">
78 78 <template v-slot:footer>
79   - <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票要求" :inputBorder="false" :disabled="canEditQualityFields" />
  79 + <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票要求" :inputBorder="false" :disabled="!roleCodes.includes('bscnq') &&canEditQualityFields" />
80 80 </template>
81 81 </uni-list-item>
82 82 <uni-list-item class="amount-item">
... ... @@ -85,12 +85,12 @@
85 85 </template>
86 86 <template v-slot:footer>
87 87 <view class="amount-row">
88   - <uni-easyinput type="digit" v-model="form.shippingCost" placeholder="请输入运费" :inputBorder="false" :disabled="canEditQualityFields" />
  88 + <uni-easyinput type="digit" v-model="form.shippingCost" placeholder="请输入运费" :inputBorder="false" :disabled="!roleCodes.includes('bscnq') &&canEditQualityFields" />
89 89 <text class="unit">元</text>
90 90 </view>
91 91 </template>
92 92 </uni-list-item>
93   - <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" :clickable="!canEditQualityFields"
  93 + <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" :clickable="roleCodes.includes('bscnq') &&canEditQualityFields"
94 94 @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
95 95 <template v-slot:body>
96 96 <view class="item-title"><text>执行标准</text></view>
... ... @@ -319,12 +319,14 @@ export default {
319 319 roleCodes: {
320 320 immediate: true,
321 321 handler(val) {
322   - console.log('roleCodes', val);
  322 + console.log('roleCodes111', val);
  323 + console.log('val.includes("bscnq")', val.includes('bscnq'));
323 324 // 办事处内勤 可编辑（部分编辑字段），其他角色都是不可编辑
324 325 if (val.includes('bscnq')) {
325 326 this.isReadonly = false;
326   - this.canEditQualityFields = false
327   - } else if (val.some(code => ['yfcjybjhy', 'efcjybjhy', 'sfcjybjhy', 'ztfcjybjhy'].includes(code))) {
  327 + this.canEditQualityFields = true
  328 + console.log('canEditQualityFields', this.canEditQualityFields);
  329 + } else if (val.some(code => ['yfcjybjhy', 'efcjybjhy', 'sfcjybjhy', 'ztfcjybjhy', 'ywy'].includes(code))) {
328 330 this.isReadonly = false;
329 331 this.canEditQualityFields = true
330 332 } else {
... ... @@ -477,7 +479,8 @@ export default {
477 479
478 480 ::v-deep .uni-list {
479 481 background: transparent;
480   - .uni-input-input:disabled {
  482 + .uni-textarea-textarea:disabled,
  483 + .uni-input-input:disabled {
481 484 color: rgb(51, 51, 51) !important;
482 485 }
483 486
... ...
... ... @@ -63,7 +63,7 @@
63 63
64 64 <!-- 产品 -->
65 65 <view class="section2">
66   - <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" :pageType="'modify'" :orderDate="form.orderDate" :canEditDeliveryAndAssessment="true" />
  66 + <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" :pageType="'modify'" :orderDate="form.orderDate" :canEditDeliveryAndAssessment="canEditQualityFields" />
67 67 </view>
68 68
69 69 <view class="section">
... ... @@ -87,7 +87,7 @@
87 87 </view>
88 88 </template>
89 89 </uni-list-item>
90   - <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
  90 + <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" :clickable="false"
91 91 @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
92 92 <template v-slot:body>
93 93 <view class="item-title"><text>执行标准</text></view>
... ... @@ -109,32 +109,32 @@
109 109 <uni-list-item title="件重条头">
110 110 <template v-slot:footer>
111 111 <uni-easyinput type="textarea" v-model="form.pieceWeightHeader" placeholder="请输入件重条头"
112   - :inputBorder="false" />
  112 + :inputBorder="false" :disabled="!canEditQualityFields"/>
113 113 </template>
114 114 </uni-list-item>
115 115 <uni-list-item title="表面">
116 116 <template v-slot:footer>
117   - <uni-easyinput type="textarea" v-model="form.surface" placeholder="请输入表面" :inputBorder="false" />
  117 + <uni-easyinput type="textarea" v-model="form.surface" placeholder="请输入表面" :inputBorder="false" :disabled="!canEditQualityFields" />
118 118 </template>
119 119 </uni-list-item>
120 120 <uni-list-item title="公差">
121 121 <template v-slot:footer>
122   - <uni-easyinput type="textarea" v-model="form.tolerance" placeholder="请输入公差" :inputBorder="false" />
  122 + <uni-easyinput type="textarea" v-model="form.tolerance" placeholder="请输入公差" :inputBorder="false" :disabled="!canEditQualityFields" />
123 123 </template>
124 124 </uni-list-item>
125 125 <uni-list-item title="性能">
126 126 <template v-slot:footer>
127   - <uni-easyinput type="textarea" v-model="form.performance" placeholder="请输入性能" :inputBorder="false" />
  127 + <uni-easyinput type="textarea" v-model="form.performance" placeholder="请输入性能" :inputBorder="false" :disabled="!canEditQualityFields" />
128 128 </template>
129 129 </uni-list-item>
130 130 <uni-list-item title="成分">
131 131 <template v-slot:footer>
132   - <uni-easyinput type="textarea" v-model="form.element" placeholder="请输入成分" :inputBorder="false" />
  132 + <uni-easyinput type="textarea" v-model="form.element" placeholder="请输入成分" :inputBorder="false" :disabled="!canEditQualityFields" />
133 133 </template>
134 134 </uni-list-item>
135 135 <uni-list-item title="包装">
136 136 <template v-slot:footer>
137   - <uni-easyinput type="textarea" v-model="form.packaging" placeholder="请输入包装" :inputBorder="false" />
  137 + <uni-easyinput type="textarea" v-model="form.packaging" placeholder="请输入包装" :inputBorder="false" :disabled="!canEditQualityFields" />
138 138 </template>
139 139 </uni-list-item>
140 140 <uni-list-item title="备注">
... ... @@ -206,9 +206,33 @@ export default {
206 206 },
207 207 initPurchaseOrderLineList: [],
208 208 dicOptions: { SUPPLIER: [], APPLICABLE_STANDARD: [] },
209   - sheet: { visible: false, title: '请选择', options: [], value: '', field: '' }
  209 + sheet: { visible: false, title: '请选择', options: [], value: '', field: '' },
  210 + canEditQualityFields: false,
210 211 }
211 212 },
  213 + computed: {
  214 + roleCodes() {
  215 + const g = this.$store && this.$store.getters
  216 + return (g && g.roleCodes) || []
  217 + },
  218 + },
  219 + watch: {
  220 + roleCodes: {
  221 + immediate: true,
  222 + handler(val) {
  223 + // 办事处内勤 可编辑（部分编辑字段），其他角色都是不可编辑
  224 + console.log('roleCodes1', val);
  225 + if (val.includes('bscnq')) {
  226 + this.canEditQualityFields = true
  227 + console.log('canEditQualityFields', this.canEditQualityFields);
  228 + } else if (val.some(code => ['yfcjybjhy', 'efcjybjhy', 'sfcjybjhy', 'ztfcjybjhy', 'ywy'].includes(code))) {
  229 + this.canEditQualityFields = true
  230 + } else {
  231 + this.canEditQualityFields = false
  232 + }
  233 + }
  234 + },
  235 + },
212 236 onLoad(query) {
213 237 this.id = (query && (query.id || query.code)) || ''
214 238 if (this.id) this.loadDetail(this.id)
... ... @@ -340,7 +364,8 @@ export default {
340 364
341 365 ::v-deep .uni-list {
342 366 background: transparent;
343   - .uni-input-input:disabled {
  367 + .uni-textarea-textarea:disabled,
  368 + .uni-input-input:disabled {
344 369 color: rgb(51, 51, 51) !important;
345 370 }
346 371 &-item {
... ...
... ... @@ -27,81 +27,81 @@
27 27 <uni-list class="edit-list">
28 28 <uni-list-item title="行业">
29 29 <template v-slot:footer>
30   - <uni-easyinput v-model="item.industry" placeholder="请输入行业" :inputBorder="false" :disabled="canEditDeliveryAndAssessment" />
  30 + <uni-easyinput v-model="item.industry" placeholder="请输入行业" :inputBorder="false" :disabled="true" />
31 31 </template>
32 32 </uni-list-item>
33 33 <uni-list-item title="品质">
34 34 <template v-slot:footer>
35   - <uni-easyinput v-model="item.quality" placeholder="请输入品质" :inputBorder="false" :disabled="canEditDeliveryAndAssessment" />
  35 + <uni-easyinput v-model="item.quality" placeholder="请输入品质" :inputBorder="false" :disabled="true" />
36 36 </template>
37 37 </uni-list-item>
38 38 <uni-list-item title="牌号">
39 39 <template v-slot:footer>
40   - <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :inputBorder="false" :disabled="canEditDeliveryAndAssessment" />
  40 + <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :inputBorder="false" :disabled="true" />
41 41 </template>
42 42 </uni-list-item>
43 43
44 44 <uni-list-item title="厚度(mm)">
45 45 <template v-slot:footer>
46   - <uni-easyinput type="digit" v-model="item.thickness" placeholder="请输入厚度" :inputBorder="false" :disabled="canEditDeliveryAndAssessment" />
  46 + <uni-easyinput type="digit" v-model="item.thickness" placeholder="请输入厚度" :inputBorder="false" :disabled="true" />
47 47 </template>
48 48 </uni-list-item>
49 49 <uni-list-item title="厚度公差上限(mm)">
50 50 <template v-slot:footer>
51   - <uni-easyinput type="digit" v-model="item.thicknessTolPos" placeholder="请输入厚度公差上限" :inputBorder="false" :disabled="canEditDeliveryAndAssessment" />
  51 + <uni-easyinput type="digit" v-model="item.thicknessTolPos" placeholder="请输入厚度公差上限" :inputBorder="false" :disabled="true" />
52 52 </template>
53 53 </uni-list-item>
54 54 <uni-list-item title="厚度公差下限(mm)">
55 55 <template v-slot:footer>
56   - <uni-easyinput type="digit" v-model="item.thicknessTolNeg" placeholder="请输入厚度公差下限" :inputBorder="false" :disabled="canEditDeliveryAndAssessment" />
  56 + <uni-easyinput type="digit" v-model="item.thicknessTolNeg" placeholder="请输入厚度公差下限" :inputBorder="false" :disabled="true" />
57 57 </template>
58 58 </uni-list-item>
59 59
60 60 <uni-list-item title="宽度(mm)">
61 61 <template v-slot:footer>
62   - <uni-easyinput type="digit" v-model="item.width" placeholder="请输入宽度" :inputBorder="false" :disabled="canEditDeliveryAndAssessment" />
  62 + <uni-easyinput type="digit" v-model="item.width" placeholder="请输入宽度" :inputBorder="false" :disabled="true" />
63 63 </template>
64 64 </uni-list-item>
65 65 <uni-list-item title="宽度公差上限(mm)">
66 66 <template v-slot:footer>
67   - <uni-easyinput type="digit" v-model="item.widthTolPos" placeholder="请输入宽度公差上限" :inputBorder="false" :disabled="canEditDeliveryAndAssessment" />
  67 + <uni-easyinput type="digit" v-model="item.widthTolPos" placeholder="请输入宽度公差上限" :inputBorder="false" :disabled="true" />
68 68 </template>
69 69 </uni-list-item>
70 70 <uni-list-item title="宽度公差下限(mm)">
71 71 <template v-slot:footer>
72   - <uni-easyinput type="digit" v-model="item.widthTolNeg" placeholder="请输入宽度公差下限" :inputBorder="false" :disabled="canEditDeliveryAndAssessment" />
  72 + <uni-easyinput type="digit" v-model="item.widthTolNeg" placeholder="请输入宽度公差下限" :inputBorder="false" :disabled="true" />
73 73 </template>
74 74 </uni-list-item>
75 75
76 76 <uni-list-item title="长度(mm)">
77 77 <template v-slot:footer>
78   - <uni-easyinput type="digit" v-model="item.length" placeholder="请输入长度" :inputBorder="false" :disabled="canEditDeliveryAndAssessment" />
  78 + <uni-easyinput type="digit" v-model="item.length" placeholder="请输入长度" :inputBorder="false" :disabled="true" />
79 79 </template>
80 80 </uni-list-item>
81 81 <uni-list-item title="长度公差上限(mm)">
82 82 <template v-slot:footer>
83   - <uni-easyinput type="digit" v-model="item.lengthTolPos" placeholder="请输入长度公差上限" :inputBorder="false" :disabled="canEditDeliveryAndAssessment" />
  83 + <uni-easyinput type="digit" v-model="item.lengthTolPos" placeholder="请输入长度公差上限" :inputBorder="false" :disabled="true" />
84 84 </template>
85 85 </uni-list-item>
86 86 <uni-list-item title="长度公差下限(mm)">
87 87 <template v-slot:footer>
88   - <uni-easyinput type="digit" v-model="item.lengthTolNeg" placeholder="请输入长度公差下限" :inputBorder="false" :disabled="canEditDeliveryAndAssessment" />
  88 + <uni-easyinput type="digit" v-model="item.lengthTolNeg" placeholder="请输入长度公差下限" :inputBorder="false" :disabled="true" />
89 89 </template>
90 90 </uni-list-item>
91 91
92 92 <uni-list-item title="状态">
93 93 <template v-slot:footer>
94   - <uni-easyinput v-model="item.status" placeholder="请输入状态" :inputBorder="false" :disabled="canEditDeliveryAndAssessment" />
  94 + <uni-easyinput v-model="item.status" placeholder="请输入状态" :inputBorder="false" :disabled="true" />
95 95 </template>
96 96 </uni-list-item>
97 97 <uni-list-item title="数量kg">
98 98 <template v-slot:footer>
99   - <uni-easyinput type="digit" v-model="item.quantity" placeholder="请输入数量" :inputBorder="false" :disabled="canEditDeliveryAndAssessment" />
  99 + <uni-easyinput type="digit" v-model="item.quantity" placeholder="请输入数量" :inputBorder="false" :disabled="true" />
100 100 </template>
101 101 </uni-list-item>
102 102 <uni-list-item title="销售价格" v-if="item.showSalesPrice">
103 103 <template v-slot:footer>
104   - <uni-easyinput type="digit" v-model="item.salesPrice" placeholder="请输入销售价格" :inputBorder="false" :disabled="canEditDeliveryAndAssessment" />
  104 + <uni-easyinput type="digit" v-model="item.salesPrice" placeholder="请输入销售价格" :inputBorder="false" :disabled="true" />
105 105 </template>
106 106 </uni-list-item>
107 107
... ... @@ -113,7 +113,7 @@
113 113 <view class="amount-row">
114 114 <uni-easyinput type="digit" v-model="item.packagingFee" placeholder="0.00"
115 115 :inputBorder="false"
116   - :disabled="canEditDeliveryAndAssessment"
  116 + :disabled="canEditDeliveryAndAssessment && !roleCodes.includes('bscnq')"
117 117 @input="onNonNegativeNumberInput($event, item, idx, 'packagingFee')"
118 118 @blur="onNonNegativeNumberBlur(item, idx, 'packagingFee')" />
119 119 <text class="unit">元</text>
... ... @@ -134,7 +134,7 @@
134 134 @input="onAssessmentInput($event, idx)" @blur="onAssessmentBlur($event, idx)" />
135 135 </template>
136 136 </uni-list-item>
137   - <uni-list-item class="select-item" :class="String(item.sampleOrder) ? 'is-filled' : 'is-empty'" :clickable="!canEditDeliveryAndAssessment"
  137 + <uni-list-item class="select-item" :class="String(item.sampleOrder) ? 'is-filled' : 'is-empty'" :clickable="!roleCodes.includes('ywy') "
138 138 @click="openSheet(idx)" :rightText="(item.sampleOrder === true ? '是' : (item.sampleOrder === false ? '否' : '')) || '请选择'" showArrow>
139 139 <template v-slot:body>
140 140 <view class="item-title"><text>是否为试样订单</text></view>
... ... @@ -201,7 +201,7 @@
201 201 <uni-easyinput type="digit" v-model="item.packagingFee" placeholder="0.00"
202 202 :inputBorder="false"
203 203 @input="onNonNegativeNumberInput($event, item, idx, 'packagingFee')"
204   - @blur="onNonNegativeNumberBlur(item, idx, 'packagingFee')" :disabled="canEditDeliveryAndAssessment"/>
  204 + @blur="onNonNegativeNumberBlur(item, idx, 'packagingFee')" :disabled="!roleCodes.includes('bscnq') && canEditDeliveryAndAssessment"/>
205 205 <text class="unit">元</text>
206 206 </view>
207 207 </template>
... ... @@ -220,7 +220,7 @@
220 220 :placeholder="pageType === 'modify' ? '' : '请输入考核超协'" :inputBorder="false" />
221 221 </template>
222 222 </uni-list-item>
223   - <uni-list-item class="select-item" :class="String(item.sampleOrder) ? 'is-filled' : 'is-empty'" :clickable="!canEditDeliveryAndAssessment"
  223 + <uni-list-item class="select-item" :class="String(item.sampleOrder) ? 'is-filled' : 'is-empty'" :clickable="roleCodes.includes('bscnq') && canEditDeliveryAndAssessment"
224 224 @click="openSheet(idx)" :rightText="(item.sampleOrder ? '是' : '否') || '请选择'" showArrow>
225 225 <template v-slot:body>
226 226 <view class="item-title"><text>是否为试样订单</text></view>
... ... @@ -396,7 +396,11 @@ export default {
396 396 const mm = String(dt.getMonth() + 1).padStart(2, '0')
397 397 const dd = String(dt.getDate()).padStart(2, '0')
398 398 return `${yy}/${mm}/${dd}`
399   - }
  399 + },
  400 + roleCodes() {
  401 + const g = this.$store && this.$store.getters
  402 + return (g && g.roleCodes) || []
  403 + },
400 404 },
401 405 watch: {
402 406 items: {
... ... @@ -623,7 +627,10 @@ export default {
623 627
624 628 ::v-deep .uni-list {
625 629 background: transparent;
626   -
  630 + .uni-textarea-textarea:disabled,
  631 + .uni-input-input:disabled {
  632 + color: rgb(51, 51, 51) !important;
  633 + }
627 634 &-item {
628 635 &__extra-text {
629 636 font-size: 32rpx;
... ...