Browse Source

2023-12-13

codeMan 1 year ago
parent
commit
4397638893

+ 4 - 2
src/DRP/HDrpManagement/dispatchBill/detail/index.vue

@@ -17,7 +17,7 @@
           <template v-if="utils.hasPermission('billMxEdit')" #operation>
             <a-space class="mt-10">
               <a-button :disabled="utils.isDisabled(billData.STATUS,['提交','审核','关闭','复核'])" :type="isEditDisabled?'primary':'dashed'" @click="editRowProd">{{isEditDisabled?'行编辑':'保存'}}</a-button>
-              <select-product rowKey="sa_orderitemsid" :disabled="utils.isDisabled(billData.STATUS,['提交','审核','关闭','复核'])" :param="paramAdd" :columns="utils.TBLayout('addDetailsTable')" :tableid="utils.TBLayoutID('addDetailsTable')" @onSelectChange="onAddSelect"></select-product>
+              <select-product rowKey="sa_orderitemsid" :disabled="utils.isDisabled(billData.STATUS,['提交','审核','关闭','复核'])" :param="paramAdd" :columns="utils.TBLayout('addDetailsTable')" :tableid="utils.TBLayoutID('addDetailsTable')" ref="selectProductEl" @onSelectChange="onAddSelect"></select-product>
               <a-button :disabled="utils.isDisabled(billData.STATUS,['提交','审核','关闭'],(selection.length == 0))" type="primary" @click="deleteProd">删除商品</a-button>
             </a-space>
           </template>
@@ -26,7 +26,7 @@
               <a-input-number style="width:100%" v-model:value="data.record.qty" :disabled="utils.isDisabled(billData.STATUS,['提交','审核','关闭','复核'],isEditDisabled)" :min="data.record.orderminqty" :step="data.record.orderaddqty" @change="inputChange(data.record)"></a-input-number>
             </template>
             <template v-if="data.column.dataIndex === 'remarks' && utils.hasPermission('billMxEdit')">
-              <a-input style="width:100%" :disabled="utils.isDisabled(billData.STATUS,['提交','审核','关闭','复核'],isEditDisabled)" v-model:value="data.record.remarks" :min="1" @change="inputChange(data.record)" placeholder="请输入商品备注"/>
+              <a-input style="width:100%" :disabled="utils.isDisabled(billData.STATUS,['提交','审核','关闭','复核'],isEditDisabled)" v-model:value="data.record.remarks" :min="1" @change="inputChange(data.record)"/>
             </template>
             <template v-if="data.column.dataIndex == 'batchno' && utils.hasPermission('billMxEdit')">
               <a-select v-if="data.record.batchcontrol == 1" style="width:100%;" v-model:value="data.record.batchno" :disabled="utils.isDisabled(billData.STATUS,['提交','审核','关闭','复核'],isEditDisabled)" @focus="dropdownVisibleChange(data.record)" @change="inputChange(data.record)">
@@ -151,6 +151,7 @@ const deleteProd = ()=>{
     onCancel() {},
   })
 }
+let selectProductEl = ref()
 const onAddSelect = async (val)=>{
   const res = await Api.requested({
     "id": 20221115104603,
@@ -169,6 +170,7 @@ const onAddSelect = async (val)=>{
   })
   utils.message(res,'添加成功',()=>{
     prodlist.value.listData()
+    selectProductEl.value.listData()
     mianData()
   })
 }

+ 1 - 1
src/DRP/HDrpManagement/orderManage/detail/index.vue

@@ -89,7 +89,7 @@
             <template v-if="data.column.dataIndex === 'remarks'">
               <a-tooltip>
                 <template #title>{{data.record.remarks}}</template>
-                <a-input style="width:100%" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],isEditDisabled)" v-model:value="data.record.remarks" :min="1"  @change="inputChange(data.record,'remarks')" placeholder="请输入商品备注"/>
+                <a-input style="width:100%" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],isEditDisabled)" v-model:value="data.record.remarks" :min="1"  @change="inputChange(data.record,'remarks')"/>
               </a-tooltip>            
             </template>
           </template>

+ 1 - 1
src/DRP/HDrpManagement/returnedPurchase/detail/index.vue

@@ -40,7 +40,7 @@
               <a-input type="number" :disabled="utils.isDisabled(billData.status,['提交','审核','复核','关闭'],isEditDisabled)" v-model:value="data.record.qty" @change="inputChange(data.record)"></a-input>
             </template>
             <template v-if="data.column.dataIndex == 'reason' && utils.hasPermission('billMxEdit')">
-              <a-input :disabled="utils.isDisabled(billData.status,['提交','复核','关闭'],isEditDisabled)" style="width:300px" v-model:value="data.record.reason" placeholder="输入返退原因" @change="inputChange(data.record)"></a-input>
+              <a-input :disabled="utils.isDisabled(billData.status,['提交','复核','关闭'],isEditDisabled)" style="width:300px" v-model:value="data.record.reason" @change="inputChange(data.record)"></a-input>
             </template>
           </template>
         </product-list>

+ 1 - 1
src/customized/cucu/orderManage/detail/index.vue

@@ -102,7 +102,7 @@
             <template v-if="data.column.dataIndex === 'remarks'">
               <a-tooltip>
                 <template #title>{{data.record.remarks}}</template>
-                <a-input style="width:100%" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],isEditDisabled)" v-model:value="data.record.remarks" :min="1"  @change="inputChange(data.record,'remarks')" placeholder="请输入商品备注"/>
+                <a-input style="width:100%" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],isEditDisabled)" v-model:value="data.record.remarks" :min="1"  @change="inputChange(data.record,'remarks')"/>
               </a-tooltip>
             </template>
           </template>

+ 2 - 1
src/template/selectProduct/index.vue

@@ -171,7 +171,8 @@
     tableRecord.value = []
   }
   defineExpose({
-    visible
+    visible,
+    listData
   })
   onMounted(()=>{
     // listData()