优化
This commit is contained in:
@@ -62,7 +62,7 @@ public class DailyplanServiceImpl implements DailyplanService {
|
||||
map.put("material_code", "%" + material_code + "%");
|
||||
}
|
||||
map.put("flag", "1");
|
||||
JSONObject jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "pp.planstart_date");
|
||||
JSONObject jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "pp.planstart_date,pp.plan_code");
|
||||
JSONArray json = jret.getJSONArray("content");
|
||||
JSONArray ja = new JSONArray();
|
||||
for(int i=0;i<json.size();i++){
|
||||
|
||||
@@ -140,7 +140,7 @@
|
||||
OPTION 输入.device_id <> ""
|
||||
pp.device_id = 输入.device_id
|
||||
ENDOPTION
|
||||
order by pp.planstart_date
|
||||
order by pp.planstart_date,pp.plan_code
|
||||
ENDSELECT
|
||||
ENDQUERY
|
||||
ENDIF
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
<el-table
|
||||
ref="dragTable"
|
||||
:data="tableDtl"
|
||||
row-key="dailyplan_id"
|
||||
style="width: 100%;"
|
||||
border
|
||||
:highlight-current-row="true"
|
||||
@@ -38,7 +39,7 @@
|
||||
<el-table-column prop="planstart_date" label="计划开始日期" width="100" />
|
||||
<el-table-column prop="plan_org_name" label="申报单位" width="100" />
|
||||
<el-table-column prop="workorder_type" label="计划类型" :formatter="workorder_typeFormat" min-width="120" />
|
||||
<el-table-column prop="material_code" label="物料编码" min-width="150"/>
|
||||
<el-table-column prop="material_code" label="物料编码" min-width="150" />
|
||||
<el-table-column prop="old_mark" label="牌号" />
|
||||
<el-table-column :formatter="seriesFormat" min-width="80" prop="mater_product_series" label="产品系列" />
|
||||
<el-table-column prop="product_weight" label="生产重量(kg)" :formatter="crud.formatNum3" min-width="120" />
|
||||
@@ -81,7 +82,7 @@ export default {
|
||||
tableDtl: [],
|
||||
cxjList: [],
|
||||
XLList: [],
|
||||
queryrow: { device_id:'' },
|
||||
queryrow: { device_id: '' },
|
||||
sortable: null,
|
||||
rows: []
|
||||
}
|
||||
@@ -159,7 +160,7 @@ export default {
|
||||
this.crud.notify('无可提交的记录!')
|
||||
return false
|
||||
}
|
||||
dailyplan.submit2({ query: this.queryrow, rows: this.rows}).then(res => {
|
||||
dailyplan.submit2({ query: this.queryrow, rows: this.rows }).then(res => {
|
||||
this.crud.notify('操作成功!')
|
||||
this.tableDtl = []
|
||||
this.$emit('update:dialogShow', false)
|
||||
|
||||
Reference in New Issue
Block a user