chenrui 4 سال پیش
والد
کامیت
a3b25e573d

+ 3 - 3
src/views/allocationManagement/transferOut/list.vue

@@ -85,8 +85,8 @@
       :scroll="{ x: 1940, y: tableHeight }"
       bordered>
       <!-- 单号 -->
-      <template slot="allocateSn" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.allocateSn }}</span>
+      <template slot="allocateNo" slot-scope="text, record">
+        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.allocateNo }}</span>
       </template>
       <!-- 财务状态 -->
       <template slot="settleState" slot-scope="text, record">
@@ -148,7 +148,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
-        { title: '调拨单号', scopedSlots: { customRender: 'allocateSn' }, align: 'center' },
+        { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center' },
         { title: '调往对象', dataIndex: 'targetName', width: 220, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户类型', dataIndex: 'callOutTypeName', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总数量', dataIndex: 'totalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 20 - 1
src/views/salesManagement/outboundOrder/list.vue

@@ -44,6 +44,16 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
+			<a-col :md="6" :sm="24">
+			  <a-form-item label="业务单号">
+			    <a-input id="outboundOrderList-outBizNo" v-model.trim="queryParam.outBizNo" allowClear placeholder="请输入业务单号"/>
+			  </a-form-item>
+			</a-col>
+			<a-col :md="6" :sm="24">
+			  <a-form-item label="出库单号">
+			    <a-input id="outboundOrderList-stockOutNo" v-model.trim="queryParam.stockOutNo" allowClear placeholder="请输入出库单号"/>
+			  </a-form-item>
+			</a-col>
           </template>
           <a-col :md="6" :sm="24">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="outboundOrderList-refresh" style="margin-bottom: 15px;">查询</a-button>
@@ -107,6 +117,8 @@ export default {
       queryParam: { //  查询条件
         demanderName: '', //  客户名称
         outBizType: undefined, //  出库类型
+		stockOutNo: '',
+		outBizNo: '',
         state: undefined //  状态
       },
       disabled: false, //  查询、重置按钮是否可操作
@@ -187,6 +199,8 @@ export default {
       this.queryParam.demanderName = ''
       this.queryParam.outBizType = undefined
       this.queryParam.state = undefined
+      this.queryParam.stockOutNo = ''
+      this.queryParam.outBizNo = ''
       this.time = []
       this.$refs.table.refresh(true)
     },
@@ -206,7 +220,12 @@ export default {
       let params = []
       if (row) { //  单个出库
         content = '确认要出库吗?'
-        params = [row.stockOutSn]
+        params = [{
+          stockOutSn: row.stockOutSn,
+          outBizSn: row.outBizSn,
+          outBizSubSn: row.outBizSubSn,
+          outBizType: row.outBizType
+        }]
       } else { //  批量出库
         content = '确认要批量出库吗?'
         if (this.selectedRowKeys.length < 1) {

+ 1 - 1
src/views/salesManagement/salesReturn/list.vue

@@ -147,7 +147,7 @@
           class="button-error"
           @click="handleDel(record)"
           id="salesReturn-del-btn">取消</a-button>
-        <span v-if="record.billStatus == 'FINISH'||record.billStatus == 'CANCEL'||record.billStatus == 'AUDIT_REJECT'||record.billStatus == 'FINANCIAL_REJECT'||record.billStatus == 'WAIT_FINANCIAL_AUDIT'">--</span>
+        <span v-if="!(record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE') && !(record.billStatus == 'WAIT_CHECK') && !(record.salesReturnBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'FINANCIAL_REJECT')) && !(record.salesReturnBillSource != 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE'))">--</span>
       </template>
     </s-table>
     <!-- 选择客户弹框 -->