meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liushuai
2020-03-26 18:32:14 +08:00
parent 7317c3d73e 809d6049ef
commit c35509fe94
8 changed files with 95 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/api/BasicData/MenuManagement.js
View File

@@ -110,3 +110,21 @@ export function submitAdd(name) {
} }
}) })
} }
// 查询二级模块分给那些角色
export function searchJS(name) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '3',
name: ` select 角色功能,title from
基础表_模块信息 inner join 基础表_角色模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id
inner join 菜单系统模块_项目角色 on 基础表_角色模块信息.角色编号 = 菜单系统模块_项目角色.角色编号
order by title`,
param: `模块名称=${name}`
}
})
}

25
src/api/PurchasingCenter/PurchaseContractRequestFund.js
View File

@@ -113,3 +113,28 @@ export function searchPurchaseContract(check1, check, num) {
} }
}) })
} }
// 请款审批查看状态
export function RequestFund() {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '采购管理_离线合同_请款查看状态_查询数据'
}
})
}
export function setChakan2() {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: '采购管理_离线合同_更新查看状态_修改数据'
}
})
}

4
src/utils/curd.js
View File

@@ -13,8 +13,8 @@ export default {
// 1）type：11查询；12增删改，必须 // 1）type：11查询；12增删改，必须
// 2）name：存储过程名，必须 // 2）name：存储过程名，必须
// 3）data：存储过程参数名和对应值，例如： // 3）data：存储过程参数名和对应值，例如：
// this.param[0] = ['设备类型编码', '3', 'string', '0'] // param[0] = ['工艺计划流水号', this.工艺计划流水号] 输入参数
// this.param[1] = ['output', '3', 'int', '1']，必须 // param[1] = ['PageCurrent', '1111', 'int', '1'] output参数
// 数组里四个分别对应：存储过程参数名（必须）；存储过程参数值（必须）；参数类型（若是output必须）；参数是否为output（0否1是） // 数组里四个分别对应：存储过程参数名（必须）；存储过程参数值（必须）；参数类型（若是output必须）；参数是否为output（0否1是）
// 4）pageSize，pageList：分页使用，可选 // 4）pageSize，pageList：分页使用，可选
Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) { Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) {

1
src/views/BasicData/MenuManagement/index.vue
View File

@@ -377,4 +377,3 @@ export default {
padding-right: 8px; padding-right: 8px;
} }
</style> </style>

67
src/views/ManufacturingCenter/InitialProduction/index.vue
View File

@@ -10,7 +10,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="机床图号" style="margin-top:28px"> <el-form-item label="机床图号" style="margin-top:28px">
<el-select v-model="toolNumValue" filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="机床图号" @change="typeChange1()"> <el-select v-model="toolNumValue" filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="机床图号" @change="typeChange1()" @focus="typeChange()">
<el-option <el-option
v-for="item in toolNum" v-for="item in toolNum"
:key="item.value" :key="item.value"
@@ -34,51 +34,51 @@
</el-form> </el-form>
</el-col> </el-col>
<el-col style="width: 530px"> <el-col style="width: 530px;margin-left: 50px">
<el-form label-width="70px" label-position="left" class="Time"> <el-form label-width="70px" label-position="left" class="Time">
<el-form-item label="计划下达"> <el-form-item label="计划下达">
<el-col :span="11"> <el-col :span="8">
<el-date-picker v-model="time_planStart" size="small" type="datetime" class="time" readonly/> <el-date-picker v-model="time_planStart" size="small" type="date" class="time" readonly/>
</el-col> </el-col>
<el-col :span="1" class="line">～</el-col> <el-col :span="1" class="line">～</el-col>
<el-col :span="11"> <el-col :span="8">
<el-date-picker v-model="time_planFinish" size="small" type="datetime" class="time" readonly/> <el-date-picker v-model="time_planFinish" size="small" type="date" class="time" readonly/>
</el-col> </el-col>
</el-form-item> </el-form-item>
<el-form-item label="工艺"> <el-form-item label="工艺">
<el-col :span="11"> <el-col :span="8">
<el-date-picker v-model="time_gongyiStart" size="small" type="datetime" class="time" readonly/> <el-date-picker v-model="time_gongyiStart" size="small" type="date" class="time" readonly/>
</el-col> </el-col>
<el-col :span="1" class="line">～</el-col> <el-col :span="1" class="line">～</el-col>
<el-col :span="11"> <el-col :span="8">
<el-date-picker v-model="time_gongyiFinish" size="small" type="datetime" class="time" readonly/> <el-date-picker v-model="time_gongyiFinish" size="small" type="date" class="time" readonly/>
</el-col> </el-col>
</el-form-item> </el-form-item>
<el-form-item label="定额"> <el-form-item label="定额">
<el-col :span="11"> <el-col :span="8">
<el-date-picker v-model="time_dingeStart" size="small" type="datetime" class="time" readonly/> <el-date-picker v-model="time_dingeStart" size="small" type="date" class="time" readonly/>
</el-col> </el-col>
<el-col :span="1" class="line">～</el-col> <el-col :span="1" class="line">～</el-col>
<el-col :span="11"> <el-col :span="8">
<el-date-picker v-model="time_dingeFinish" size="small" type="datetime" class="time" readonly/> <el-date-picker v-model="time_dingeFinish" size="small" type="date" class="time" readonly/>
</el-col> </el-col>
</el-form-item> </el-form-item>
<el-form-item label="计划平衡"> <el-form-item label="计划平衡">
<el-col :span="11"> <el-col :span="8">
<el-date-picker v-model="time_planpinghengStart" size="small" type="datetime" class="time" readonly/> <el-date-picker v-model="time_planpinghengStart" size="small" type="date" class="time" readonly/>
</el-col> </el-col>
<el-col :span="1" class="line">～</el-col> <el-col :span="1" class="line">～</el-col>
<el-col :span="11"> <el-col :span="8">
<el-date-picker v-model="time_planpinghengFinish" size="small" type="datetime" class="time" readonly/> <el-date-picker v-model="time_planpinghengFinish" size="small" type="date" class="time" readonly/>
</el-col> </el-col>
</el-form-item> </el-form-item>
<el-form-item label="加工"> <el-form-item label="加工">
<el-col :span="11"> <el-col :span="8">
<el-date-picker v-model="time_machiningStart" size="small" type="datetime" class="time" readonly/> <el-date-picker v-model="time_machiningStart" size="small" type="date" class="time" readonly/>
</el-col> </el-col>
<el-col :span="1" class="line">～</el-col> <el-col :span="1" class="line">～</el-col>
<el-col :span="11"> <el-col :span="8">
<el-date-picker v-model="time_machiningFinish" :picker-options="pickerOptions" default-time="23:59:59" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/> <el-date-picker v-model="time_machiningFinish" :picker-options="pickerOptions" default-time="23:59:59" size="small" type="date" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:150px"/>
</el-col> </el-col>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -371,7 +371,7 @@
<el-input v-model="form10.规格" placeholder="规格" size="small" style="width:160px" clearable/> <el-input v-model="form10.规格" placeholder="规格" size="small" style="width:160px" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="零件数量" prop="零件数量"> <el-form-item label="零件数量" prop="零件数量">
<el-input-number v-model="form10.零件数量" :step="1" :min="0" size="mini" style="width:160px"/> <el-input-number v-model="form10.零件数量" :step="1" :min="1" size="mini" style="width:160px"/>
</el-form-item> </el-form-item>
<el-form-item label="零件备注" prop="零件备注"> <el-form-item label="零件备注" prop="零件备注">
<el-input v-model="form10.零件备注" placeholder="零件备注" size="small" style="width:160px" clearable/> <el-input v-model="form10.零件备注" placeholder="零件备注" size="small" style="width:160px" clearable/>
@@ -531,16 +531,16 @@ export default {
// if (to.name === 'InitialProduction') { // if (to.name === 'InitialProduction') {
// _this.typeChange() // _this.typeChange()
// } // }
// },
// '$route': {
// handler(route) {
// const _this = this
// console.log(route.name)
// if (route.name === 'InitialProduction') {
// _this.typeChange()
// }
// }
// } // }
// // '$route': {
// // handler(route) {
// // const _this = this
// // console.log(route.name)
// // if (route.name === 'InitialProduction') {
// // _this.typeChange()
// // }
// // }
// // }
// }, // },
created() { created() {
this.typeChange() this.typeChange()
@@ -1347,7 +1347,7 @@ export default {
margin: 10px 0 10px 10px; margin: 10px 0 10px 10px;
} }
.time{ .time{
width: 200px; width: 150px;
} }
.Time>.el-form-item{ .Time>.el-form-item{
margin:2px; margin:2px;
@@ -1373,4 +1373,3 @@ export default {
margin-bottom: 13px; margin-bottom: 13px;
} }
</style> </style>

1
src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
View File

@@ -496,6 +496,7 @@ export default {
}) })
}, },
rowClick(row) { rowClick(row) {
this.radio = ''
searchtable(1, row.项目流水号, 1, row.机床流水号, 0, 0, 0, '', '', 0, '', '', 1, 100).then(response => { searchtable(1, row.项目流水号, 1, row.机床流水号, 0, 0, 0, '', '', 0, '', '', 1, 100).then(response => {
if (response.data.total !== 0) { if (response.data.total !== 0) {
this.machineNum = row.机床图号 this.machineNum = row.机床图号

18
src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
View File

@@ -19,7 +19,7 @@
<el-button type="primary" class="el-icon-search" size="small" plain style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button> <el-button type="primary" class="el-icon-search" size="small" plain style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
</el-card> </el-card>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="7">
<el-card> <el-card>
<el-table v-loading="loading" :data="tableData" highlight-current-row size="mini" stripe style="width: 100%;" height="700px" border element-loading-text="拼命加载中" @row-click="searchTable2"> <el-table v-loading="loading" :data="tableData" highlight-current-row size="mini" stripe style="width: 100%;" height="700px" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table-column label="操作者" align="center" show-overflow-tooltip> <el-table-column label="操作者" align="center" show-overflow-tooltip>
@@ -32,7 +32,7 @@
{{ scope.row.总数量 }} {{ scope.row.总数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="加工工时(分)" align="center" width="110px"> <el-table-column label="加工工时(分)" align="center" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.完成总工时 }} {{ scope.row.完成总工时 }}
</template> </template>
@@ -42,7 +42,7 @@
<!--{{ scope.row.修补准结总工时 }}--> <!--{{ scope.row.修补准结总工时 }}-->
<!--</template>--> <!--</template>-->
<!--</el-table-column>--> <!--</el-table-column>-->
<el-table-column label="扫码工时(分)" align="center" width="110px"> <el-table-column label="扫码工时(分)" align="center" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.扫码总工时 }} {{ scope.row.扫码总工时 }}
</template> </template>
@@ -58,10 +58,10 @@
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="17">
<el-card> <el-card>
<el-table v-loading="loading2" :data="tableData2" size="mini" style="width: 100%;" height="700px" border element-loading-text="拼命加载中"> <el-table v-loading="loading2" :data="tableData2" size="mini" style="width: 100%;" height="700px" border element-loading-text="拼命加载中">
<el-table-column label="零件图号" align="center" width="135px" show-overflow-tooltip> <el-table-column label="零件图号" align="center" width="150px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
@@ -86,12 +86,12 @@
<!--{{ scope.row.计划工时 }}--> <!--{{ scope.row.计划工时 }}-->
<!--</template>--> <!--</template>-->
<!--</el-table-column>--> <!--</el-table-column>-->
<el-table-column label="单件工时(分)" align="center" width="110px"> <el-table-column label="单件工时(分)" align="center" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.修补单件工时 }} {{ scope.row.修补单件工时 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="加工工时(分)" align="center" width="110px"> <el-table-column label="加工工时(分)" align="center" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.完成工时 }} {{ scope.row.完成工时 }}
</template> </template>
@@ -101,7 +101,7 @@
{{ scope.row.修补工时 }} {{ scope.row.修补工时 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="扫码工时(分)" align="center" width="110px"> <el-table-column label="扫码工时(分)" align="center" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.扫码工时 }} {{ scope.row.扫码工时 }}
</template> </template>
@@ -111,7 +111,7 @@
{{ scope.row.完成日期 }} {{ scope.row.完成日期 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" fixed="right" width="130px"> <el-table-column align="center" label="操作" fixed="right" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button> <el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
</template> </template>

14
src/views/layout/components/Navbar.vue
View File

@@ -32,7 +32,7 @@ import { getMaterial, getMaterial_NOTES, setChakan } from '@/api/PurchasingCente
import { initApproval, initApprovalOffline } from '@/api/PurchasingCenter/FundApproval' import { initApproval, initApprovalOffline } from '@/api/PurchasingCenter/FundApproval'
import { searchUrgentItem } from '@/api/ManufacturingCenter/InitialProduction' import { searchUrgentItem } from '@/api/ManufacturingCenter/InitialProduction'
import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/InvoiceSettlementApprove' import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/InvoiceSettlementApprove'
import { searchRequestFund } from '@/api/PurchasingCenter/PurchaseContractRequestFund' import { RequestFund, setChakan2 } from '@/api/PurchasingCenter/PurchaseContractRequestFund'
import { getPickingList, setPickingList } from '@/api/Inventory/MaterialOut' import { getPickingList, setPickingList } from '@/api/Inventory/MaterialOut'
import { searchTable } from '@/api/PurchasingCenter/PurchaseMaterielModify' import { searchTable } from '@/api/PurchasingCenter/PurchaseMaterielModify'
export default { export default {
@@ -126,14 +126,14 @@ export default {
} }
}) })
if (this.token.toString() === '2') { if (this.token.toString() === '2') {
searchRequestFund(1, 9999, 0, 0, 0, 0, 0).then(res => { RequestFund().then(res => {
if (res.data.length) { if (res.data[0].数量 > 0) {
this.noticeContract2 = null this.noticeContract2 = null
this.noticeContract2 = this.$notify.success({ this.noticeContract2 = this.$notify.success({
title: '提示', title: '提示',
message: '有合同请款申请审批结果，点击查看', message: '有合同请款申请审批结果，点击查看',
onClick: () => { onClick: () => {
setChakan().then(res => { setChakan2().then(res => {
this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' }) this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' })
setTimeout(this.noticeContract2.close(), 1000) setTimeout(this.noticeContract2.close(), 1000)
}) })
@@ -159,14 +159,14 @@ export default {
} }
}) })
} else if (this.token.toString() === '3') { } else if (this.token.toString() === '3') {
searchRequestFund(1, 99999, 0, 0, 0, 0, 0).then(res => { RequestFund().then(res => {
if (res.data.length) { if (res.data[0].数量 > 0) {
this.noticeContract4 = null this.noticeContract4 = null
this.noticeContract4 = this.$notify.success({ this.noticeContract4 = this.$notify.success({
title: '提示', title: '提示',
message: '有合同请款申请审批结果，点击查看', message: '有合同请款申请审批结果，点击查看',
onClick: () => { onClick: () => {
setChakan().then(res => { setChakan2().then(res => {
this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' }) this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' })
setTimeout(this.noticeContract4.close(), 1000) setTimeout(this.noticeContract4.close(), 1000)
}) })