Merge branch 'cjerp-contract-1.0' into publish_cjerp

gesilong
2 parents 25a9410d 3e6ffb48
Showing 5 changed files with 25 additions and 6 deletions
pages/change_list/add.vue
pages/change_list/modify.vue
pages/contract_foreign_stock/detail.vue
pages/contract_stock/detail.vue
pages/order_list/modify.vue
--- a/pages/change_list/add.vue
View file @b229733
+++ b/pages/change_list/add.vue
View file @b229733
@@ -16,7 +16,8 @@
           </uni-list-item>
           <uni-list-item title="订货单位">
             <template v-slot:footer>
-              <view class="readonly-text">{{ form.orderingUnitName }}</view>
+              <uni-easyinput v-if="orderingUnitEditable" v-model="form.orderingUnitName" placeholder="请输入订货单位" :inputBorder="false" />
+              <view v-else class="readonly-text">{{ form.orderingUnitName }}</view>
             </template>
           </uni-list-item>
           <uni-list-item title="订货日期">
@@ -164,6 +165,7 @@ export default {
   components: { Product, SingleSelectSheet, RelateSelectSheet },
   data() {
     return {
+      orderingUnitEditable: false,
       form: {
         orderNo: '',
         orderId: '',
@@ -283,12 +285,14 @@ export default {
       const _fieldKey = this.relate.fieldKey
       const first = (items && items.length > 0) ? items[0] : null
       if (_fieldKey === 'orderNo') {
+        this.orderingUnitEditable = false
         const id = first && (first.id || first.code)
         if (id) {
           try {
             const res = await loadOrderApi([id])
             const data = res && res.data ? res.data : null
             const item = Array.isArray(data) ? (data[0] || {}) : (data || {})
+            this.orderingUnitEditable = String(item.status || '') === 'ISSUED'
             const next = { ...this.form, ...item }
             next.orderNo = next.orderNo || ((first && (first.orderNo || first.code)) || '');
             next.orderId = next.id || '';
--- a/pages/change_list/modify.vue
View file @b229733
+++ b/pages/change_list/modify.vue
View file @b229733
@@ -15,7 +15,8 @@
           </uni-list-item>
           <uni-list-item title="订货单位">
             <template v-slot:footer>
-              <view class="readonly-text">{{ form.orderingUnitName }}</view>
+              <uni-easyinput v-if="orderingUnitEditable" v-model="form.orderingUnitName" placeholder="请输入订货单位" :inputBorder="false" />
+              <view v-else class="readonly-text">{{ form.orderingUnitName }}</view>
             </template>
           </uni-list-item>
           <uni-list-item title="订货日期">
@@ -148,7 +149,7 @@
 </template>
 <script>
-import { getDetailApi, updateApi } from '@/api/change_list.js'
+import { getDetailApi, loadOrderApi, updateApi } from '@/api/change_list.js'
 import Product from './product.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import { getDicName } from '@/utils/dic.js'
@@ -160,6 +161,7 @@ export default {
   data() {
     return {
       id: '',
+      orderingUnitEditable: false,
       form: {
         orderId: '',
         purchaseOrderId: '',
@@ -219,6 +221,19 @@ export default {
         })) : []
         this.form = next;
         this.initPurchaseOrderLineList = next.purchaseOrderLineList || [];
+        const oid = next.purchaseOrderId || next.orderId || ''
+        if (oid) {
+          try {
+            const r = await loadOrderApi([oid])
+            const data = r && r.data ? r.data : null
+            const item = Array.isArray(data) ? (data[0] || {}) : (data || {})
+            this.orderingUnitEditable = String(item.status || '') === 'ISSUED'
+          } catch (e) {
+            this.orderingUnitEditable = false
+          }
+        } else {
+          this.orderingUnitEditable = false
+        }
         this.refreshStandardName()
       } catch (e) {
         uni.showToast({ title: '加载失败', icon: 'none' })
--- a/pages/contract_foreign_stock/detail.vue
View file @b229733
+++ b/pages/contract_foreign_stock/detail.vue
View file @b229733
@@ -314,7 +314,7 @@ export default {
             return [
                 { ...this.buttons[0], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:modify')) }, //编辑
                 { ...this.buttons[1], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:delete')) }, //删除
-                { ...this.buttons[2], visible: (s === 'FORMAL' && !l && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:lock')) }, //锁价
+                { ...this.buttons[2], visible: (s === 'FORMAL' && this.detail.canPriceLock && !l && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:lock')) }, //锁价
                 { ...this.buttons[3], visible: ((s === 'DRAFT' || s === 'FORMAL') && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:upload')) }, 
                 { ...this.buttons[4], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:upload')) }, 
                 { ...this.buttons[5], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:standard-upload')) },
--- a/pages/contract_stock/detail.vue
View file @b229733
+++ b/pages/contract_stock/detail.vue
View file @b229733
@@ -305,7 +305,7 @@ export default {
         return [
           { ...this.buttons[0], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:modify')) },
           { ...this.buttons[1], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:delete'))  },
-          { ...this.buttons[2], visible: (s === 'FORMAL' && !l && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:lock'))  },
+          { ...this.buttons[2], visible: (s === 'FORMAL' && this.detail.canPriceLock && !l && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:lock'))  },
           { ...this.buttons[3], visible: ((s === 'DRAFT' || s === 'FORMAL') && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:upload')) },
           { ...this.buttons[4], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:upload')) },
           { ...this.buttons[5], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-upload')) },
--- a/pages/order_list/modify.vue
View file @b229733
+++ b/pages/order_list/modify.vue
View file @b229733
@@ -141,7 +141,7 @@
         </uni-list-item>
         <uni-list-item title="备注">
           <template v-slot:footer>
-            <view class="readonly-text">{{ form.remarks }}</view>
+            <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false"  />
           </template>
         </uni-list-item>
         <view class="footer">