|
@@ -11,7 +11,11 @@
|
|
|
<a-input placeholder="请输入计划号" v-model="queryParam.planNo"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
-
|
|
|
+ <a-col :md="6" :sm="8">
|
|
|
+ <a-form-item label="对单人">
|
|
|
+ <a-input placeholder="请输入" v-model="queryParam.planMan"></a-input>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
<a-col :md="6" :sm="8">
|
|
|
<a-form-item label="日期" has-feedback>
|
|
|
<a-range-picker
|
|
@@ -25,15 +29,29 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
|
|
|
- <a-col :md="6" :sm="8">
|
|
|
+ <template v-if="toggleSearchStatus">
|
|
|
+ <a-col :md="6" :sm="8">
|
|
|
<a-form-item label="面损表单据状态">
|
|
|
- <a-input placeholder="请输入面损表单据状态" v-model="queryParam.fstatus"></a-input>
|
|
|
+ <a-select v-model="queryParam.fstatus">
|
|
|
+ <a-select-option value="">请选择</a-select-option>
|
|
|
+ <a-select-option value="保存">保存</a-select-option>
|
|
|
+ <a-select-option value="提交">提交</a-select-option>
|
|
|
+ <a-select-option value="返单">返单</a-select-option>
|
|
|
+ <a-select-option value="完成">完成</a-select-option>
|
|
|
+ </a-select>
|
|
|
+ <!-- <a-input placeholder="请输入面损表单据状态" v-model="queryParam.fstatus"></a-input> -->
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <template v-if="toggleSearchStatus">
|
|
|
<a-col :md="6" :sm="8">
|
|
|
<a-form-item label="分配表单据状态">
|
|
|
- <a-input placeholder="请输入分配表单据状态" v-model="queryParam.cstatus"></a-input>
|
|
|
+ <a-select v-model="queryParam.cstatus">
|
|
|
+ <a-select-option value="">请选择</a-select-option>
|
|
|
+ <a-select-option value="保存">保存</a-select-option>
|
|
|
+ <a-select-option value="提交">提交</a-select-option>
|
|
|
+ <a-select-option value="返单">返单</a-select-option>
|
|
|
+ <a-select-option value="完成">完成</a-select-option>
|
|
|
+ </a-select>
|
|
|
+ <!-- <a-input placeholder="请输入分配表单据状态" v-model="queryParam.cstatus"></a-input> -->
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="8">
|
|
@@ -51,11 +69,7 @@
|
|
|
<a-input placeholder="请输入" v-model="queryParam.maker"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="8">
|
|
|
- <a-form-item label="对单人">
|
|
|
- <a-input placeholder="请输入" v-model="queryParam.planMan"></a-input>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
+
|
|
|
<a-col :md="6" :sm="8">
|
|
|
<a-form-item label="备注">
|
|
|
<a-input placeholder="请输入" v-model="queryParam.remarks"></a-input>
|
|
@@ -99,6 +113,11 @@
|
|
|
<a-input placeholder="请输入" v-model="record.planMan" v-if="record.enter=='1'"></a-input>
|
|
|
<span v-if="record.enter=='0'">{{ record.planMan }}</span>
|
|
|
</span>
|
|
|
+ <span slot="ffinalApproveDate" slot-scope="text, record">
|
|
|
+ <a-date-picker style="width: 100%" v-model="record.ffinalApproveDate" :format="dateFormat" v-if="record.enter=='1'"> </a-date-picker>
|
|
|
+ <!-- <a-input placeholder="请输入" v-model="record.ffinalApproveDate" v-if="record.enter=='1'"></a-input> -->
|
|
|
+ <span v-if="record.enter=='0'">{{ text!==''&&text?moment(text).format('YYYY-MM-DD'):'' }}</span>
|
|
|
+ </span>
|
|
|
<span slot="option" slot-scope="text, record">
|
|
|
<a :disabled="record.enter=='0'" @click="sava(record)"> 保存</a>
|
|
|
<a-divider type="vertical" />
|
|
@@ -260,6 +279,7 @@ export default {
|
|
|
width: 180,
|
|
|
dataIndex: 'option',
|
|
|
className: 'replacecolor',
|
|
|
+ fixed: 'right',
|
|
|
scopedSlots: { customRender: 'option' },
|
|
|
},
|
|
|
|
|
@@ -279,8 +299,9 @@ export default {
|
|
|
loading: false // 表格加载
|
|
|
}
|
|
|
},
|
|
|
- created() {
|
|
|
- this.getCostList()
|
|
|
+ async created() {
|
|
|
+ await this.defaultData()
|
|
|
+ await this.getCostList()
|
|
|
},
|
|
|
methods: {
|
|
|
// 分页查询
|
|
@@ -305,6 +326,13 @@ export default {
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
+ defaultData(){
|
|
|
+ var tYear = new Date().getFullYear()
|
|
|
+ var startTime = new Date(tYear, 0, 1)
|
|
|
+ this.dverifyDate=[moment(startTime),moment(new Date())]
|
|
|
+ this.queryParam.dverifyDateE=this.dverifyDate[1].format('YYYY-MM-DD')
|
|
|
+ this.queryParam.dverifyDateB=this.dverifyDate[0].format('YYYY-MM-DD')
|
|
|
+ },
|
|
|
searchQuery() {
|
|
|
this.getCostList()
|
|
|
},
|