diff --git a/src/api/model/srm.js b/src/api/model/srm.js index a393189c..288f9d37 100644 --- a/src/api/model/srm.js +++ b/src/api/model/srm.js @@ -162,4 +162,84 @@ patentinfo: { } }, }, + platform: { + list: { + url: `${config.API_URL}/srm/pf/`, + name: "平台台账列表", + req: async function(data){ + return await http.get(this.url, data); + } + }, + item: { + name: "论文台账详情", + req: async function(id){ + return await http.get( `${config.API_URL}/srm/pf/${id}/`); + } + }, + create: { + url: `${config.API_URL}/srm/pf/`, + name: "论文台账创建", + req: async function(data){ + return await http.post(this.url, data); + } + }, + update: { + name: "论文台账更新", + req: async function(id, data){ + return await http.put( + `${config.API_URL}/srm/pf/${id}/`, + data + ); + } + }, + delete: { + name: "删除论文台账", + req: async function(id){ + return await http.delete(`${config.API_URL}/srm/pf/${id}/`); + } + }, + }, + platstand: { + list: { + url: `${config.API_URL}/srm/ps/`, + name: "平台台账列表", + req: async function(data){ + return await http.get(this.url, data); + } + }, + item: { + name: "平台台账详情", + req: async function(id){ + return await http.get( `${config.API_URL}/srm/ps/${id}/`); + } + }, + create: { + url: `${config.API_URL}/srm/ps/`, + name: "平台台账创建", + req: async function(data){ + return await http.post(this.url, data); + } + }, + update: { + name: "平台台账更新", + req: async function(id, data){ + return await http.put( + `${config.API_URL}/srm/ps/${id}/`, + data + ); + } + }, + delete: { + name: "删除平台台账", + req: async function(id){ + return await http.delete(`${config.API_URL}/srm/ps/${id}/`); + } + }, + get_name: { + name: "获取平台列表", + req: async function(search=''){ + return await http.get(`${config.API_URL}/srm/ps/paper_name/`,{params: { search }}); + } + }, + }, } diff --git a/src/views/home/ly_run_rate.vue b/src/views/home/ly_run_rate.vue index 26cb9161..6ce26f29 100644 --- a/src/views/home/ly_run_rate.vue +++ b/src/views/home/ly_run_rate.vue @@ -7,8 +7,9 @@ + + + + + + + + + + 搜索 + + + + + + + + + + + + + + + 搜索 + + + + + @@ -83,50 +128,6 @@ - - - - - - - - - - 搜索 - - - - - - - - - - - - - - - 搜索 - - - - - diff --git a/src/views/ofm/borrowfile_form.vue b/src/views/ofm/borrowfile_form.vue index d22d32d6..66ff6e02 100644 --- a/src/views/ofm/borrowfile_form.vue +++ b/src/views/ofm/borrowfile_form.vue @@ -53,7 +53,6 @@ - diff --git a/src/views/ofm/seal.vue b/src/views/ofm/seal.vue index 10cac5a1..18ddc32c 100644 --- a/src/views/ofm/seal.vue +++ b/src/views/ofm/seal.vue @@ -78,7 +78,7 @@ 是 否 - + diff --git a/src/views/srm/paperlist.vue b/src/views/srm/paperlist.vue index a898ec93..b64c8bd5 100644 --- a/src/views/srm/paperlist.vue +++ b/src/views/srm/paperlist.vue @@ -135,7 +135,7 @@ - + 新增 - + + + + + + {{ actStateEnum[scope.row.ticket_?.act_state]?.text }} + + {{ scope.row.ticket_?.state_.name }} + + + 详情 - {handleQuery(); limitedVisible = false}" @closed="limitedVisible = false" /> @@ -115,174 +127,43 @@ - diff --git a/src/views/srm/plat_form.vue b/src/views/srm/plat_form.vue index dc7efb71..04c47963 100644 --- a/src/views/srm/plat_form.vue +++ b/src/views/srm/plat_form.vue @@ -2,77 +2,55 @@ - - + + - - + + + - - + + - - - - - - - - + + + + + 是 否 - - + + 是 否 - - - - - {{ item.name }} - - 是 - 否 - - - - fileUPSuccess(res, item)" - :disabled="localMode ==='view'" - > - - - - - - - - - - {{ item.name }} - - - 页/张 - - - + + + + + + - + @@ -100,57 +77,50 @@ import ticketd_b from "@/views/wf/ticketd_b.vue"; import ticketd from '@/views/wf/ticketd.vue' export default { props: { - mode: { type: String, default: "view" }, // add / edit / view - modelValue: { type: Object, default: () => ({}) }, + mode: { type: String, default: "show" }, // add / edit / show t_id: { type: String, default: null }, }, components: {ticketd, ticketd_b}, - emits: ["update:modelValue", "submit", "cancel"], data() { return { ticket_data: {}, - ticketTitle: "论文申密申请", + ticketTitle: "平台审批", localMode : this.mode, rules: { filename: [{ required: true, message: "请输入文件名称", trigger: "blur" }], }, - localForm: { - ticket_: { state_: { type: '' } }, - ...(this.modelValue || {}) } + localForm: {} }; }, - watch: { - localForm: { - handler(val) { - Object.assign(this.ticket_data, { - author: val.author, - // 其他需要同步的字段... - }); - }, - deep: true, - } - }, + mounted(){ + let that=this + if(that.t_id){ + that.getTid(); + }else{ + that.localMode = "add"; + that.localForm.belong_dept = that.$TOOL.data.get("USER_INFO").belong_dept; + } + }, methods: { async submit_b_func() { let that = this; if(that.localForm?.id){ - that.localMode = "edit"; - } + that.localMode = "edit"; + } if(that.localMode == "add") { - let res = await that.$API.srm.papersecret.create.req(that.localForm); - + let res = await that.$API.srm.platform.create.req(that.localForm); that.localForm.id = res.id; } else if (that.localMode == "edit") { - await that.$API.srm.papersecret.update.req(that.localForm.id, that.localForm); + await that.$API.srm.platform.update.req(that.localForm.id, that.localForm); } }, getTid (){ var that = this; if (that.t_id) { - that.$API.srm.papersecret.item.req(that.t_id).then(res=>{ + that.$API.srm.platform.item.req(that.t_id).then(res=>{ that.localForm = res; if(res.ticket_?.state_?.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) { that.localMode = "edit"; @@ -160,42 +130,6 @@ export default { }) } }, - fileUPSuccess(res, item) { - if(!item.fileList) { - item.fileList = [] - } - item.fileList.push(res.path) - item.file = res.path - }, - handleCheckChange(item) { - // 如果取消勾选,清空页数 - if (!item.checked) { - item.pages = ''; - } - }, - // 当选择“否”时清空文件 - handleStatusChange(item) { - if (item.status === "否") { - item.file = ""; - item.fileList = []; - } - }, }, }; - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/srm/plat_record.vue b/src/views/srm/plat_record.vue new file mode 100644 index 00000000..74a79c0b --- /dev/null +++ b/src/views/srm/plat_record.vue @@ -0,0 +1,463 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ scope.row.city_p ? '是' : '否'}} + + + + + + + {{ scope.row.province_p ? '是' : '否'}} + + + + + + 编辑 + + + + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > + + + + + + + 保 存 + + + + + + diff --git a/src/views/statistics/bxerp/workerTimes.vue b/src/views/statistics/bxerp/workerTimes.vue index 007d6684..f639fc0b 100644 --- a/src/views/statistics/bxerp/workerTimes.vue +++ b/src/views/statistics/bxerp/workerTimes.vue @@ -41,15 +41,15 @@ id="exportDiv" stripe > - - + - + - + - {{ scope.row[item.text+'_'+item1] }} + + {{ scope.row[item.text+'_'+item1] }} @@ -85,17 +85,21 @@ export default { getData(){ let that = this; that.mgruops = []; + that.tableData = []; let params = {}; params.query = that.query; that.$API.bi.dataset.exec.req('lineDay_p', params).then((res) => { let data = res.data2.ds0; that.lists = []; + let coefficient = []; data.forEach(item=>{ let obj = JSON.parse(item.工段物料生产数); for(let key in obj){ + if(coefficient.indexOf(key)<0){ + coefficient.push(key); + } let mgroup = key.split('_')[0]; let pname = key.split('_')[1]; - if(that.mgruops.indexOf(mgroup)<0){ that.mgruops.push(mgroup); that.lists.push({text:mgroup,value:[pname]}); @@ -109,6 +113,13 @@ export default { item[pname]= obj[key]; } }) + let item0 = {日期:'系数',操作人:'',indexs:0}; + coefficient.forEach(cof=>{ + item0[cof]= 1; + }) + if(data.length>0){ + data.unshift(item0); + } that.tableData = data; }); }, diff --git a/src/views/statistics/stock_statistics.vue b/src/views/statistics/stock_statistics.vue index e4f80cb1..e4bca4bc 100644 --- a/src/views/statistics/stock_statistics.vue +++ b/src/views/statistics/stock_statistics.vue @@ -98,7 +98,7 @@ :filters="specsFilters11" :filter-method="filterSpecs11" filter-placement="bottom-end"/> - + { that.tableData11 = res; if(res.length>0){