lilei 3 weeks ago
parent
commit
d374ca4483

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1745477411009
+  "version": 1747900254080
 }

+ 1 - 1
src/views/purchasingManagement/purchaseReturnApplyForm/list.vue

@@ -116,7 +116,7 @@
               size="small"
               type="link"
               :id="'purchaseReturnList-creatApply-'+record.id"
-              v-if="record.billStatus == 'FINISH'&&$hasPermissions('B_purchaseReturnApplyCreat')"
+              v-if="record.billStatus == 'FINISH'&&record.hasReturnBillFlag==0&&$hasPermissions('B_purchaseReturnApplyCreat')"
               @click="handleWarehouse(record)"
               class="button-primary"
             >生成采购退货单</a-button>

+ 11 - 3
src/views/purchasingManagement/purchaseReturnOutSync/list.vue

@@ -15,6 +15,11 @@
                 <a-input id="purchaseReturnList-purchaseReturnNo" v-model.trim="queryParam.purchaseReturnNo" allowClear placeholder="请输入采购退货单号"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="采购退货申请单号">
+                <a-input id="purchaseReturnList-purchaseReturnApplyNo" v-model.trim="queryParam.purchaseReturnApplyNo" allowClear placeholder="请输入采购退货申请单号"/>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="供应商">
                 <a-select id="purchaseReturnList-purchaseTarget" v-model="queryParam.returnTargetSn" placeholder="请选择供应商">
@@ -189,6 +194,7 @@ export default {
         beginDate: getDate.getCurrMonthDays().starttime, // 开始时间
         endDate: getDate.getCurrMonthDays().endtime, // 结束时间
         purchaseReturnNo: '', //  退货单号
+        purchaseReturnApplyNo: '', // 退货申请单号
         state: undefined, //  业务状态
         settleState: undefined, // 结算状态
         returnTargetSn: undefined, // 供应商
@@ -198,9 +204,10 @@ export default {
       tableHeight: 0, // 表格高度
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '采退单号', scopedSlots: { customRender: 'purchaseReturnNo' }, width: '12%', align: 'center' },
-        { title: '供应商', dataIndex: 'returnTargetName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采退单号', scopedSlots: { customRender: 'purchaseReturnNo' }, width: '10%', align: 'center' },
+        { title: '采退申请单号', dataIndex: 'purchaseReturnApplyNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '供应商', dataIndex: 'returnTargetName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品款数', dataIndex: 'totalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总金额', dataIndex: 'totalAmount', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
@@ -249,6 +256,7 @@ export default {
       this.queryParam.beginDate = flag ? '' : getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = flag ? '' : getDate.getCurrMonthDays().endtime
       this.queryParam.purchaseReturnNo = ''
+      this.queryParam.purchaseReturnApplyNo = ''
       this.queryParam.state = undefined
       this.queryParam.settleState = undefined
       this.queryParam.returnTargetSn = undefined