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-04-08 18:05:35 +08:00
parent 9525a0fdc2 2433af53d5
commit dc0b9cc5d9
34 changed files with 341 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/MarketingCenter/CreateProject.js
View File

@@ -49,7 +49,7 @@ export function addList() {
ModularID: router.currentRoute.path,
type: '2',
name: '基础表_合同信息表_制造部_增加数据',
param: '项目名称=' + arguments[0] + '&备注=' + arguments[1] + '&合同签订日期=' + arguments[2]
param: '项目名称=' + arguments[0] + '&备注=' + arguments[1] + '&合同签订日期=' + arguments[2] + '&自家创建人员编号=' + arguments[3]
}
})
}

4
src/api/Outsourcing/OutsourcingTaskExecution.js
View File

@@ -110,7 +110,7 @@ export function editData1(Number, manufacturers, freight, Explain) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间生产管理_外协加工任务单_修改数据',
param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=0&单据状态=2&入库标志=1&扣款说明=&扣款_质量=0&扣款_计划=0&扣款_其他=0'
param: '外协加工任务单流水号=' + Number + '&外协厂家=' + manufacturers + '&运费=0&单据状态=2&入库标志=1&扣款说明=&扣款_质量=0&扣款_计划=0&扣款_其他=0'
}
})
}
@@ -138,7 +138,7 @@ export function editData(Number, manufacturers, freight, Explain) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间生产管理_外协加工任务单_修改数据',
param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&扣款说明=' + Explain
param: '外协加工任务单流水号=' + Number + '&外协厂家=' + manufacturers + '&运费=' + freight + '&扣款说明=' + Explain
}
})
}

4
src/main.js
View File

@@ -25,6 +25,10 @@ import elDragDialog from '@/directive/el-dragDialog'
// 全局数字、金额输入框组件
import directive from './components/AmountInputBox/index.js'
Vue.use(directive)
import axios from 'axios' // 引入axios
Vue.prototype.$axios = axios // 修改原型链
// axios.defaults.withCredentials = true
Vue.use(elDragDialog)
Vue.component('barcode', VueBarcode)

1
src/utils/request.js
View File

@@ -26,6 +26,7 @@ export const MESUploadFile = `http://123.56.95.229:8010/submit/MESUploadFile.ash
export const MESDownloadFile = `http://123.56.95.229:8010/submit/MESDownloadFile.ashx`
const service = axios.create({
baseURL: `http://123.56.95.229:8010/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.1.192:8045/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service

36
src/views/Assembly/QualityBasicData/index.vue
View File

@@ -7,19 +7,8 @@
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">不合格原因</div>
</el-row>
<el-button size="small" type="warning" icon="el-icon-circle-plus-outline" plain style="margin-left: 80%;margin-top: 15px" @click="handleAdd1()">新增</el-button>
<el-table
:data="tableData"
border
style="width: 100%;max-height: 450px;margin-top: 10px"
height="350px"
size="mini"
stripe
highlight-current-row>
<el-table-column
type="index"
label="序号"
align="center"
width="50"/>
<el-table :data="tableData" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" size="mini" stripe highlight-current-row>
<el-table-column type="index" label="序号" align="center" width="50"/>
<el-table-column label="不合格原因" align="center">
<template slot-scope="scope">
{{ scope.row.不合格原因文本 }}
@@ -27,11 +16,7 @@
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="70px">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"/>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
@@ -247,17 +232,20 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible=false">取消</el-button>
<el-button type="primary" @click="submitAdd()">确定</el-button>
<el-button :disabled="disable" type="primary" @click="submitAdd()">确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>import { initReasons, initHandle, initSize, initAppearance, initPosition, initTest, initTesting, addReasons, addHandle, addSize, addAppearance, addPosition,
<script>
import { initReasons, initHandle, initSize, initAppearance, initPosition, initTest, initTesting, addReasons, addHandle, addSize, addAppearance, addPosition,
addTest, addTesting, deleteReasons, deleteHandle, deleteSize, deleteAppearance, deletePosition, deleteTest, deleteTesting } from '@/api/Assembly/QualityBasicData'
export default {
data() {
return {
disable: false,
tableData: [],
tableData1: [],
tableData2: [],
@@ -329,33 +317,41 @@ export default {
},
handleAdd1() {
this.title = '增加不合格原因'
this.disable = false
this.dialogFormVisible = true
},
handleAdd2() {
this.title = '增加不合格处理'
this.disable = false
this.dialogFormVisible = true
},
handleAdd3() {
this.title = '增加质检尺寸'
this.disable = false
this.dialogFormVisible = true
},
handleAdd4() {
this.title = '增加质检外观'
this.disable = false
this.dialogFormVisible = true
},
handleAdd5() {
this.title = '增加质检形位'
this.disable = false
this.dialogFormVisible = true
},
handleAdd6() {
this.title = '增加检测项'
this.disable = false
this.dialogFormVisible = true
},
handleAdd7() {
this.title = '增加检测项明细'
this.disable = false
this.dialogFormVisible = true
},
submitAdd() {
this.disable = true
if (this.title === '增加不合格原因') {
addReasons(this.Reasons).then(response => {
if (response.data[0].result === '1') {

8
src/views/Assembly/QualityInspectionInformationInquiry/index.vue
View File

@@ -589,11 +589,7 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button
type="primary"
size="small"
icon="el-icon-check"
@click="submitTable">确定</el-button>
<el-button :disabled="AddTableData_disable" type="primary" size="small" icon="el-icon-check" @click="submitTable">确定</el-button>
</div>
</el-dialog>
</div>
@@ -770,6 +766,7 @@ export default {
this.groupNumber = []
this.procedureNum = []
this.operators = []
this.AddTableData_disable = false
this.dialogFormVisible10 = true
},
formatJson(filterVal, jsonData) {
@@ -876,6 +873,7 @@ export default {
submitTable() {
this.$refs['form2'].validate((valid) => {
if (valid) {
this.AddTableData_disable = true
submitTable(this.form2.工序, this.form2.质检类型, this.form2.检测数, this.form2.质检情况, this.id, this.form2.不合格数量, this.form2.不合格原因, this.form2.不合格处理, this.form2.备注, this.form2.操作工).then(response => {
if (response.data[0].result === '1') {
this.dialogFormVisible10 = false

23
src/views/BasicData/PersonnelManagement/index.vue
View File

@@ -219,8 +219,8 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取消</el-button>
<el-button v-if="department_Title==='新增部门'" type="primary" @click="submitAdd('department_Form')">确定</el-button>
<el-button v-else-if="department_Title==='编辑部门'" type="primary" @click="submitEdit('department_Form')">确定</el-button>
<el-button v-if="department_Title==='新增部门'" :disabled="handleAdd_disable" type="primary" @click="submitAdd('department_Form')">确定</el-button>
<el-button v-else-if="department_Title==='编辑部门'" :disabled="handleAdd_disable" type="primary" @click="submitEdit('department_Form')">确定</el-button>
</div>
</el-dialog>
@@ -321,8 +321,8 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="btnLoading" @click="cancel">取消</el-button>
<el-button v-if="people_title === '新增人员'" :loading="btnLoading" type="primary" @click="submitAddPeople">确定</el-button>
<el-button v-else-if="people_title === '编辑人员'" :loading="btnLoading" type="primary" @click="submitEditPeople">确定</el-button>
<el-button v-if="people_title === '新增人员'" :disabled="addPeople_disable" :loading="btnLoading" type="primary" @click="submitAddPeople">确定</el-button>
<el-button v-else-if="people_title === '编辑人员'" :disabled="addPeople_disable" :loading="btnLoading" type="primary" @click="submitEditPeople">确定</el-button>
</div>
</el-dialog>
@@ -445,6 +445,8 @@ import request from '@/utils/request'
export default {
data() {
return {
handleAdd_disable: false,
addPeople_disable: false,
limit: 999,
readFile: readFile,
disabledMove: true,
@@ -636,20 +638,22 @@ export default {
this.$refs.upload.submit()
},
handleAdd(formName) {
this.department_Title = '新增部门'
this.department_DFV = true
this.department_Form.DepartmentName = ''
this.count1 = this.count1 + 1
if (this.count1 !== 1) {
this.$refs[formName].resetFields()
}
this.department_Title = '新增部门'
this.handleAdd_disable = false
this.department_DFV = true
},
handleEdit() {
this.addForm('department_Form')
if (this.id) {
this.department_Title = '编辑部门'
this.department_DFV = true
this.department_Form.DepartmentName = this.nodeName
this.handleAdd_disable = false
this.department_DFV = true
} else {
this.$message.warning(`请选择要修改的部门`)
}
@@ -657,6 +661,7 @@ export default {
submitAdd(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.handleAdd_disable = true
this.department_DFV = false
if (this.id) {
addDepartmentName(this.id, this.department_Form.DepartmentName, 0).then(response => {
@@ -687,6 +692,7 @@ export default {
submitEdit(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.handleAdd_disable = true
this.department_DFV = false
editList(this.id, this.department_Form.DepartmentName).then(response => {
if (response.data[0].result === '1') {
@@ -755,6 +761,7 @@ export default {
addPeople() {
if (this.id) {
this.people_title = '新增人员'
this.addPeople_disable = false
this.people_DFV = true
this.addForm('people_form')
} else {
@@ -762,6 +769,7 @@ export default {
}
},
submitAddPeople() {
this.addPeople_disable = true
this.btnLoading = true
addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => {
this.btnLoading = false
@@ -794,6 +802,7 @@ export default {
this.people_form.ContactInformation = row.联系电话
},
submitEditPeople() {
this.addPeople_disable = true
this.btnLoading = true
editPeople(this.people_form.PeopleID, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => {
this.btnLoading = false

9
src/views/BasicData/SystemRrolemaintenance/index.vue
View File

@@ -54,7 +54,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogFormVisible1 = false">取消</el-button>
<el-button type="primary" size="small" @click="submitAdd1('form')">确定</el-button>
<el-button :disabled="handleAdd_disable" type="primary" size="small" @click="submitAdd1('form')">确定</el-button>
</div>
</el-dialog>
@@ -71,7 +71,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogFormVisible2 = false">取消</el-button>
<el-button type="primary" size="small" @click="submitAdd2('form2')">确定</el-button>
<el-button :disabled="handleAdd_disable" type="primary" size="small" @click="submitAdd2('form2')">确定</el-button>
</div>
</el-dialog>
</div>
@@ -82,6 +82,7 @@ import { InitRolefunction, deleteData, searchTable, addData, addData2 } from '@/
export default {
data() {
return {
handleAdd_disable: false,
RoleFunctioning: '',
loading: false,
tableData: [],
@@ -134,6 +135,7 @@ export default {
if (this.$refs['form2'] !== undefined) {
this.$refs['form2'].resetFields()
}
this.handleAdd_disable = false
this.dialogFormVisible2 = true
this.form2.角色功能 = row.角色功能
this.num = row.角色编号
@@ -141,6 +143,7 @@ export default {
submitAdd2(formName) { // 编辑角色功能
this.$refs[formName].validate((valid) => {
if (valid) {
this.handleAdd_disable = true
addData2(this.form2.角色功能, this.num).then(response => {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
@@ -154,6 +157,7 @@ export default {
submitAdd1(formName) { // 增加角色功能
this.$refs[formName].validate((valid) => {
if (valid) {
this.handleAdd_disable = true
addData(this.form.角色功能).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
@@ -169,6 +173,7 @@ export default {
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
this.handleAdd_disable = false
this.dialogFormVisible1 = true
},
handleDelete(row) { // 删除

24
src/views/BasicData/WorkshopPersonnelRoleMana/index.vue
View File

@@ -1,11 +1,8 @@
<template>
<div class="app-container">
<table style="width: 100%">
<el-card>
<!-- <span>员工姓名:</span>-->
<el-input v-model="staffName" placeholder="员工姓名" size="small" clearable style="width:200px;margin: 0px 10px"/>
<!-- <span style="margin-left: 15px">角色名称:</span>-->
<el-select v-model="roleName" placeholder="角色名称" clearable size="small" style="width:200px;margin: 0px 10px">
<el-option
v-for="item in roleNames"
@@ -18,12 +15,8 @@
</el-card>
<el-card>
<el-table :data="tableData" highlight-current-row stripe size="mini" height="820" border style="width: 100%">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table :data="tableData" highlight-current-row stripe size="mini" height="700" border style="width: 100%">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="员工姓名" align="center">
<template slot-scope="scope">
{{ scope.row.姓名 }}
@@ -151,7 +144,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOFF">取 消</el-button>
<el-button type="primary" @click="submitAdd1()">确 定</el-button>
<el-button :disabled="handelAdd_disable" type="primary" @click="submitAdd1()">确 定</el-button>
</div>
</el-dialog>
@@ -188,7 +181,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOFF">取消</el-button>
<el-button type="primary" @click="submitAdd2()">确定</el-button>
<el-button :disabled="handelAdd_disable" type="primary" @click="submitAdd2()">确定</el-button>
</div>
</el-dialog>
@@ -200,6 +193,7 @@ import { dialogtablevisible, deleteData, getTree, fn, getTable8, initOrderType,
export default {
data() {
return {
handelAdd_disable: false,
number: '',
form1: {
staffName: '',
@@ -247,24 +241,26 @@ export default {
},
methods: {
handelAdd(row) {
this.dialogFormVisible1 = true
this.ssks = ''
this.cjscgy = ''
if (this.$refs['form1'] !== undefined) {
this.$refs['form1'].resetFields()
}
this.handelAdd_disable = false
this.dialogFormVisible1 = true
},
submitEdit(index, row) {
if (this.$refs['form2'] !== undefined) {
this.$refs['form2'].resetFields()
}
this.dialogFormVisible2 = true
this.personnelStream = row.人员角色流水号
this.form2.staffName = row.姓名
this.ssks = row.部门名称
this.personnelNumber = row.人员编号
this.form2.roleName = parseInt(row.角色编号)
this.cjscgy = row.考勤编号
this.handelAdd_disable = false
this.dialogFormVisible2 = true
},
callOFF() {
this.dialogFormVisible1 = false
@@ -316,6 +312,7 @@ export default {
submitAdd1() {
this.$refs['form1'].validate((valid) => {
if (valid) {
this.handelAdd_disable = true
addData1(this.personnelNumber, this.form1.roleName).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
@@ -335,6 +332,7 @@ export default {
submitAdd2() {
this.$refs['form2'].validate((valid) => {
if (valid) {
this.handelAdd_disable = true
addData2(this.personnelStream, this.personnelNumber, this.form2.roleName).then(response => {
if (response.data[0].result === '1') {
this.$message.success('修改成功')

27
src/views/Inventory/CreatePickingList/index.vue
View File

@@ -267,7 +267,7 @@
<el-button size="small" type="primary" plain icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
<el-button size="small" type="distribution" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="createList()">创建领料单</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="为所选领料单增加物料明细" placement="top">
<el-button size="small" type="success" plain icon="el-icon-bottom" style="margin: 0 0 5px 10px" @click="selectInto()">选入物料</el-button>
<el-button :disabled="selectInto_disable" size="small" type="success" plain icon="el-icon-bottom" style="margin: 0 0 5px 10px" @click="selectInto()">选入物料</el-button>
</el-tooltip>
<el-button :disabled="Number(审批情况)===1" size="small" plain type="danger" icon="el-icon-delete" style="margin: 0 0 0 10px" @click="dropList()">删除领料单</el-button>
<el-button :disabled="Number(审批情况)===1" size="small" plain type="danger" icon="el-icon-right" style="margin-right: 20px;float: right" @click="dropListDetail()">移除领料明细</el-button>
@@ -412,7 +412,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible1=false">取消</el-button>
<el-button type="primary" @click="submitCreateList()">确 定</el-button>
<el-button :disabled="createList_disable" type="primary" @click="submitCreateList()">确 定</el-button>
</div>
</el-dialog>
</div>
@@ -426,6 +426,8 @@ export default {
name: 'CreatePickingList',
data() {
return {
createList_disable: false,
selectInto_disable: false,
审批情况: '',
peopleName: '',
ListMX: '',
@@ -764,10 +766,12 @@ export default {
}
this.form1.领料人流水号 = ''
this.form1.领料单备注 = ''
this.createList_disable = false
this.dialogFormVisible1 = true
},
// 提交创建领料单
submitCreateList() {
this.createList_disable = true
let isElectrical
Number(this.token) === 37 || Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长 37电气副部长
createList(this.form1.领料人流水号, this.form1.领料单备注, isElectrical).then(response => {
@@ -845,6 +849,7 @@ export default {
},
// 选入
selectInto() {
this.selectInto_disable = true
if (this.PartType === '离线采购件') {
const materialGroup = []
const groupPartGroup = []
@@ -871,7 +876,11 @@ export default {
this.$message.success('操作成功')
this.searchTable()
this.clickList()
} else { this.$message.error('操作失败') }
this.selectInto_disable = false
} else {
this.$message.error('操作失败')
this.selectInto_disable = false
}
})
} else {
const basePartGroup = []
@@ -893,7 +902,11 @@ export default {
this.$message.success('操作成功')
this.searchTable()
this.clickList()
} else { this.$message.error('操作失败') }
this.selectInto_disable = false
} else {
this.$message.error('操作失败')
this.selectInto_disable = false
}
})
} else { // 标准件外购件
selectIntoList(null, purchasePartGroup, this.pickingListNum).then(response => {
@@ -901,7 +914,11 @@ export default {
this.$message.success('操作成功')
this.searchTable()
this.clickList()
} else { this.$message.error('操作失败') }
this.selectInto_disable = false
} else {
this.$message.error('操作失败')
this.selectInto_disable = false
}
})
}
}

8
src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
View File

@@ -118,7 +118,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible=false">取消</el-button>
<el-button type="primary" @click="CHUKU()">确 定</el-button>
<el-button :disabled="wareHousing_disable" type="primary" @click="CHUKU()">确 定</el-button>
</div>
</el-dialog>
</div>
@@ -131,6 +131,7 @@ import { initProject, searchmachine, searchgroup, searchdata, warehousing, selec
export default {
data() {
return {
wareHousing_disable: false,
entryNameValue: '', // 项目名称
entryName: [],
machineToolValue: '', // 机床号
@@ -253,13 +254,13 @@ export default {
}
}, // 入库
wareHousing() {
console.log(this.shuzu, 121212)
if (this.shuzu.length === 0) {
this.$message.warning('请勾选出库物料')
} else {
this.selectDepartment()
this.dialogFormVisible = true
this.form.leader = ''
this.wareHousing_disable = false
this.dialogFormVisible = true
}
}, // 多选
handleSelectionChange(val) {
@@ -286,6 +287,7 @@ export default {
if (this.form.name === '') {
this.$message.error('请选择领料人')
} else {
this.wareHousing_disable = true
warehousing(this.multipleSelection, this.outgoingQuantity, this.form.name, this.remarks).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')

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

@@ -379,7 +379,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form10')">取消</el-button>
<el-button type="primary" @click="submit10('form10')">确定</el-button>
<el-button :disabled="openUrgentItem_disable" type="primary" @click="submit10('form10')">确定</el-button>
</div>
</el-dialog>
@@ -394,6 +394,7 @@ import Cookie from 'js-cookie'
export default {
data() {
return {
openUrgentItem_disable: false,
checked_hebing: true,
checked_UrgentItem: false,
UrgentItem: 0,
@@ -619,6 +620,7 @@ export default {
if (this.$refs['form10'] !== undefined) {
this.$refs['form10'].resetFields()
}
this.openUrgentItem_disable = false
this.dialogFormVisible10 = true
},
typeChange() {
@@ -705,11 +707,13 @@ export default {
submit10(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.openUrgentItem_disable = true
addUrgentItem(this.form10.机床号, this.form10.组号, this.form10.零件图号, this.form10.零件名称, this.form10.规格, this.form10.零件数量, this.form10.零件备注, this.id, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time).then(response => {
if (response.data[0].result === '1') {
this.$message.success('添加成功')
this.dialogFormVisible10 = false
} else {
this.openUrgentItem_disable = false
this.$message.error('添加失败')
}
})

10
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -345,7 +345,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel('form')">取消</el-button>
<el-button v-show="title==='增加'" type="primary" @click="submitAdd('form')">确定</el-button>
<el-button v-show="title==='增加'" :disabled="handleAdd_disable" type="primary" @click="submitAdd('form')">确定</el-button>
<el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
</div>
</el-dialog>
@@ -566,6 +566,7 @@ export default {
inject: ['reload'],
data() {
return {
handleAdd_disable: false,
dateRange: '',
partNumber: '',
dateRange1: '',
@@ -1037,19 +1038,24 @@ export default {
})
},
handleAdd() {
this.handleAdd_disable = false
this.addForm('form', [this.dialogFormVisible = true, this.title = '增加'])
this.form.请购时间 = getNowShotTime()
},
submitAdd(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.handleAdd_disable = true
addData(this.form.请购车间, this.name, this.id, this.form.请购时间, this.form.Remarks).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.dialogFormVisible = false
this.tableData6 = []
this.searchTable1()
} else { this.$message.error('增加失败') }
} else {
this.$message.error('增加失败')
this.handleAdd_disable = false
}
})
} else {
console.log('error submit!!')

7
src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
View File

@@ -23,7 +23,7 @@
<el-button type="primary" class="el-icon-search" size="small" plain style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
<el-button type="warning" class="el-icon-download" size="small" plain style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
<!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditConfirmNum">修改完成数量</el-button>-->
<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditWorkingHours">修补加工工时</el-button>
<!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditWorkingHours">修补加工工时</el-button>-->
</el-card>
<el-row>
<el-col style="width: 37%">
@@ -253,7 +253,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible3=false">取消</el-button>
<el-button type="primary" @click="submit3('form3')" >确定</el-button>
<el-button :disabled="EditWorkingHours_disable" type="primary" @click="submit3('form3')" >确定</el-button>
</div>
</el-dialog>
</div>
@@ -265,6 +265,7 @@ import { getMachines, getGroups, getTable, gettabledata1, getTree, fn, getTable8
export default {
data() {
return {
EditWorkingHours_disable: false,
index: -1,
Machine: '', // 机床号
Machines: [],
@@ -408,6 +409,7 @@ export default {
this.$refs['form3'].resetFields()
}
this.getPerson_Form3()
this.EditWorkingHours_disable = false
this.dialogFormVisible3 = true
},
getPerson_Form3() {
@@ -424,6 +426,7 @@ export default {
})
},
submit3() {
this.EditWorkingHours_disable = true
submitEdit3(this.processSerialNumber, this.form3.人员, this.form3.完成数量, this.form3.修补工时, this.form3.完成时间).then(response => {
if (response.data[0].result === '1') {
this.$message.success('补录成功')

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

@@ -23,6 +23,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;searchTable()">查询</el-button>
<!--<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;loginsession()">session</el-button>-->
<el-tooltip :open-delay="1200" effect="dark" content="只查询加急的零件" placement="top">
<el-checkbox v-model="all" size="small">加急</el-checkbox>
</el-tooltip>
@@ -32,7 +33,7 @@
</div>
</div>
<el-card>
<el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" height="570" style="width: 1000px; margin: 3px 0" size="mini" border highlight-current-row element-loading-text="拼命加载中">
<el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" height="570" style="width: 1090px; margin: 3px 0" size="mini" border highlight-current-row element-loading-text="拼命加载中">
<el-table-column label="机床图号" prop="机床图号" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -79,6 +80,11 @@
{{ scope.row.投产时间 | formatTime }}
</template>
</el-table-column>
<el-table-column label="计划员" align="center" width="90" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
@@ -118,6 +124,16 @@ export default {
this.projectChange()
},
methods: {
loginsession() {
this.$axios({
methods: 'post',
url: 'http://192.168.1.192:8045/submit/SessionID.ashx?userName=0000',
data: {
userName: '0000'
}
}).then(res => {
})
},
projectChange() {
this.machineName = []
this.machineNameValue = ''

17
src/views/ManufacturingCenter/SparePartsForScrap/index.vue
View File

@@ -231,7 +231,7 @@
<el-input-number v-model="inputC" :step="1" :min="0" :max="spareNumber-SupplementationNumber" style="width: 100px" size="small" />
<span>开始工序</span>
<el-input v-model="inputD" :disabled="true" auto-complete="off" style="width: 100px" size="small"/>
<el-button :disabled="spareNumber-SupplementationNumber===0" type="primary" size="small" plain @click="editB">补投重新生产零件</el-button>
<el-button :disabled="spareNumber-SupplementationNumber<=0" type="primary" size="small" plain @click="editB">补投重新生产零件</el-button>
</div>
</el-card>
<el-card v-show="false">
@@ -291,7 +291,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form2')">取消</el-button>
<el-button type="primary" @click="submit('form2')">确定</el-button>
<el-button :disabled="handleEdit_disable" type="primary" @click="submit('form2')">确定</el-button>
</div>
</el-dialog>
@@ -310,7 +310,7 @@
</el-form-item>
</el-form>
<div style="margin-left: 140px;margin-top: 10px">
<el-button type="primary" @click="submitRemark()">确定</el-button>
<el-button :disabled="handleEdit_disable" type="primary" @click="submitRemark()">确定</el-button>
</div>
</el-dialog>
@@ -323,6 +323,8 @@ import { mapGetters } from 'vuex'
export default {
data() {
return {
handleEdit_disable: false,
editB_disable: false,
index: 0,
remark1: '',
remark2: '',
@@ -483,12 +485,12 @@ export default {
if (this.$refs['form2'] !== undefined) {
this.$refs['form2'].resetFields()
}
console.log(index)
this.index = index
this.remark1 = ''
this.remark2 = ''
this.PCNumber = parseInt(row.批次数量)
this.title = row.零件名称
this.handleEdit_disable = false
this.dialogeditVisible = true
this.form.input1 = row.零件图号
this.code = row.工艺计划流水号
@@ -498,6 +500,7 @@ export default {
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.form2.报废数量 > 0) {
this.handleEdit_disable = true
editSpare(this.code, this.form2.报废数量, this.form2.报废原因, this.form2.报废时间, this.id).then(response => {
if (response.data[0].result === '1') {
this.$message.success('报废成功')
@@ -509,6 +512,7 @@ export default {
}
// this.fetchTableData()
} else {
this.handleEdit_disable = false
this.$message.success('报废失败')
}
})
@@ -538,15 +542,20 @@ export default {
editB() {
if (this.spareNumber - this.SupplementationNumber > 0) {
if (this.inputC > 0) {
if (!this.editB_disable) {
this.editB_disable = true
editA(this.CutCodeBefore, this.inputC).then(response => {
if (response.data[0].result === '1') {
this.$message.success('补投成功')
this.fetchTableData()
this.inputC = 0
this.editB_disable = false
} else {
this.editB_disable = false
this.$message.error('补投失败')
}
})
}
} else {
this.$message.warning('补投数量不能为零')
}

11
src/views/MarketingCenter/BidBond/index.vue
View File

@@ -336,7 +336,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="投标人" prop="投标人">
<el-input v-model="form2.投标人" size="small" placeholder="请输入投标人" style="width: 200px;" clearable readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 2;searchPer()" @clear="clear()"/>
<el-input v-model="form2.投标人" size="small" placeholder="请选择投标人" style="width: 200px;" clearable readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 2;searchPer()" @clear="clear()"/>
</el-form-item>
</el-col>
</el-row>
@@ -377,7 +377,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" icon="el-icon-circle-close" @click="callOff('form2')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form2')">确 定</el-button>
<el-button :disabled="submitDisabled" type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form2')">确 定</el-button>
</div>
</el-dialog>
@@ -490,6 +490,7 @@ export default {
}
}
return {
submitDisabled: false,
dateRange: '',
check1: '',
pickerOptions: {
@@ -814,11 +815,13 @@ export default {
} else {
this.$message.error('信息更新失败')
}
this.submitDisabled = false
})
},
submit(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.submitDisabled = true
if (this.flag1 === 1) {
this.submitTakeBack()
this.flag1 = null
@@ -859,6 +862,7 @@ export default {
this.addForm('form2')
this.title = '新增投标保证金'
this.dialogFormVisible2 = true
this.submitDisabled = false
},
addTableData1() {
addBidBond(this.form2.招标企业, this.form2.联系人, this.form2.联系电话, this.form2.保证金金额, this.peopleid, this.form2.保证金类型, this.form2.投标日期, this.form2.备注, this.form2.提前X天提醒我).then(response => {
@@ -870,11 +874,13 @@ export default {
} else {
this.$message.error('添加失败,请检查金额于提醒天数是否为数字')
}
this.submitDisabled = false
})
},
editBidBond(row) {
this.editForm(row, 'form2')
this.title = '编辑投标保证金'
this.submitDisabled = false
this.dialogFormVisible2 = true
this.form2.招标企业 = row.招标企业
this.form2.联系人 = row.联系人
@@ -900,6 +906,7 @@ export default {
} else {
this.$message.error('编辑失败')
}
this.submitDisabled = false
})
},
delBidBond(row) {

6
src/views/MarketingCenter/CRM/index.vue
View File

@@ -341,7 +341,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" icon="el-icon-circle-close" @click="callOff2('form')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit2('form2')">确 定</el-button>
<el-button :disabled="addCustomerDisabled" type="distribution" size="small" icon="el-icon-circle-check" @click="submit2('form2')">确 定</el-button>
<!--<el-button @click="callOff2()">取消</el-button>-->
<!--<el-button type="primary" @click="submit2('form2')">确 定</el-button>-->
</div>
@@ -358,6 +358,7 @@ export default {
},
data() {
return {
addCustomerDisabled: false,
dialogVisible: false,
treeData: [7],
a: '', // 营销经理地区流水号
@@ -618,6 +619,7 @@ export default {
if (this.AdressID === '' || this.AdressID === null) {
this.$message.warning('请选择一个省份')
} else {
this.addCustomerDisabled = false
this.dialogFormVisible2 = true
this.title2 = '新增客户'
}
@@ -629,6 +631,7 @@ export default {
this.dialogFormVisible2 = false
},
handleEdit(row) {
this.addCustomerDisabled = false
this.dialogFormVisible2 = true
this.title2 = '编辑客户'
this.form2.省份 = row.省份
@@ -646,6 +649,7 @@ export default {
this.form2.开户行 = row.开户行
},
submit2() {
this.addCustomerDisabled = true
function a() {
this.dialogFormVisible2 = false
this.getTable(selectCustomer, [this.AdressID, this.pageCurrent, this.pageSize], ['tableData2', 'total', 'loading2'])

5
src/views/MarketingCenter/ContractCapitalManagement/index.vue
View File

@@ -119,7 +119,7 @@
</el-table-column>
<el-table-column label="操作" align="center" width="66">
<template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-circle-plus-outline" @click.stop="addMoney(scope.row)">收款</el-button>
<el-button :disabled="addMoneyDisabled" type="text" size="mini" icon="el-icon-circle-plus-outline" @click.stop="addMoney(scope.row)">收款</el-button>
</template>
</el-table-column>
<!--<el-table-column label="操作" align="center" width="60" fixed="right">-->
@@ -221,6 +221,7 @@ export default {
},
data() {
return {
addMoneyDisabled: false,
dateRange: '',
check1: '',
pickerOptions: {
@@ -466,6 +467,7 @@ export default {
})
},
addMoney(row) {
this.addMoneyDisabled = true
this.maxnomoney = Number(row.未收金额)
this.tableData2 = []
this.moneyID = row.资金id
@@ -486,6 +488,7 @@ export default {
} else {
this.$message.error('收款失败')
}
this.addMoneyDisabled = false
})
},
cancelEdit(index, row) {

2
src/views/MarketingCenter/ContractInformationManagement/index.vue
View File

@@ -1172,8 +1172,8 @@ export default {
this.dialogFormVisible2 = false
},
submitMachine() {
this.submitMachineDisabled = true
function a() {
this.submitMachineDisabled = true
selectMachine(this.projectNum).then(response => {
this.tableData2 = response.data
this.submitMachineDisabled = false

29
src/views/MarketingCenter/CreateProject/index.vue
View File

@@ -1,6 +1,6 @@
<template>
<div>
<el-card style="padding: 3px 0px 3px 0px;width: 1135px">
<el-card style="padding: 3px 0px 3px 0px;width: 1238px">
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:180px;margin: 0px 0px" @change="PageSize = 10;PageCurrent = 1;fetchTableData1()">
<el-option
v-for="item in entryName"
@@ -48,7 +48,7 @@
<el-button icon="el-icon-bottom" type="success" plain size="small" style="margin-left: 15px" @click="exportExcel()">导出</el-button>
</el-card>
<el-row>
<el-col style="width: 680px">
<el-col style="width: 783px">
<el-card>
<el-table v-loading="listLoading" :data="tableData1" :row-key="getRowKeys" :expand-row-keys="expands" style="width: 100%" height="700" border stripe size="mini" @row-click="selectMachine">
<el-table-column align="center" label="合同编号" prop="合同编号" width="120px">
@@ -73,6 +73,11 @@
{{ scope.row.合同信息备注 }}
</template>
</el-table-column>
<el-table-column align="center" label="创建人" width="90px">
<template slot-scope="scope">
{{ scope.row.自家项目创建人 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="130px">
<template slot-scope="scope">
<el-button style="margin-left: 5px" size="mini" type="text" icon="el-icon-circle-plus-outline" @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
@@ -157,7 +162,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="submit('form')">确 定</el-button>
<el-button :disabled="ADD_disable" type="primary" @click="submit('form')">确 定</el-button>
</div>
</el-dialog>
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
@@ -177,7 +182,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff2('form1')">取消</el-button>
<el-button type="primary" @click="submitMachine('form1')">确 定</el-button>
<el-button :disabled="addMachine_disable" type="primary" @click="submitMachine('form1')">确 定</el-button>
</div>
</el-dialog>
</div>
@@ -187,12 +192,15 @@
import elInput from 'element-ui/packages/input'
import { getNowTime } from '@/utils/tool'
import { initProject, searchTable1, selectMachine, addList, editchar, delList, submitMachine, editMachine, delMachine } from '@/api/MarketingCenter/CreateProject'
import { mapGetters } from 'vuex'
export default {
components: {
elInput
},
data() {
return {
ADD_disable: false,
addMachine_disable: false,
contractNumber_check: '',
contractNumber: '', // 合同编号
entryName: [],
@@ -245,10 +253,16 @@ export default {
flag: ''
}
},
computed: {
...mapGetters([
'id'
])
},
created() {
this.init()
// this.fetchTableData1()
},
methods: {
// EXCEL 导出
// 姜福壮
@@ -344,6 +358,7 @@ export default {
},
ADD() {
this.addForm('form')
this.ADD_disable = false
this.dialogFormVisible1 = true
this.form.contractSigningDate = getNowTime()// new Date()
this.temp = 1
@@ -364,6 +379,7 @@ export default {
})
},
addTableData1() {
this.ADD_disable = true
addList(this.form.EntryName, this.form.remark, this.form.contractSigningDate).then(response => {
this.dialogFormVisible1 = false
if (response.data[0].result === '1') {
@@ -371,6 +387,7 @@ export default {
this.title = ''
this.fetchTableData1()
} else {
this.ADD_disable = false
this.$message.error('添加失败')
}
})
@@ -424,12 +441,14 @@ export default {
},
addMachine(row) {
this.projectNum = row.项目流水号
this.addMachine_disable = false
this.dialogFormVisible2 = true
this.title1 = '新增机床'
this.addForm('form1')
this.form1.项目名称 = row.项目名称
},
submitMachine() {
this.addMachine_disable = true
function a() {
selectMachine(this.projectNum).then(response => {
this.tableData2 = response.data
@@ -438,8 +457,10 @@ export default {
}
if (this.flag === 1) {
this.addTable(submitMachine, [this.projectNum, this.form1.设备型号, this.form1.设备名称, this.form1.机床数量], 'form1', a)
this.addMachine_disable = false
} else {
this.editTable(editMachine, [this.c, this.form1.设备型号, this.form1.设备名称, this.form1.机床数量], 'form1', a)
this.addMachine_disable = false
}
},
deleteMachine(row) {

6
src/views/MarketingCenter/InvoiceRecord/index.vue
View File

@@ -311,7 +311,7 @@
<!--<el-button @click="dialogFormVisible1 = false">取消</el-button>-->
<!--<el-button type="primary" @click="submit('form')">确 定</el-button>-->
<el-button size="small" icon="el-icon-circle-close" @click="dialogFormVisible1 = false">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form')">确 定</el-button>
<el-button :disabled="submitDisable" type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form')">确 定</el-button>
</div>
</el-dialog>
<!--客户选择-->
@@ -397,6 +397,7 @@ export default {
}
}
return {
submitDisable: false,
dateRange: '',
check1: '',
pickerOptions: {
@@ -724,6 +725,7 @@ export default {
this.$message.error('请先选择合同')
} else {
console.log(this.row1)
this.submitDisable = false
this.projectid = this.row1.项目流水号
this.timetime = this.row1.合同签订日期
this.changeTime()
@@ -782,6 +784,7 @@ export default {
submit(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.submitDisable = true
if (this.flag === 1) {
this.addSubmit()
} else if (this.flag === 2) {
@@ -826,6 +829,7 @@ export default {
this.form.开票时间 = row.开票时间
this.form.备注 = row.备注
this.invoiceRecordingCode = row.开票记录流水号
this.submitDisable = false
},
editSubmit() {
editSubmit(this.CustomerCode, this.form.开票金额, this.form.开票时间, this.form.备注, this.invoiceRecordingCode).then(response => {

8
src/views/MarketingCenter/PerformanceBond/index.vue
View File

@@ -370,7 +370,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" icon="el-icon-circle-close" @click="callOffPerformanceBondDialog('form2')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitPerformanceBondDialog('form2')">确 定</el-button>
<el-button :disabled="submitPerformanceBondDisabled" type="distribution" size="small" icon="el-icon-circle-check" @click="submitPerformanceBondDialog('form2')">确 定</el-button>
</div>
</el-dialog>
</div>
@@ -395,6 +395,7 @@ export default {
}
}
return {
submitPerformanceBondDisabled: false,
dateRange: '',
check1: '',
pickerOptions: {
@@ -726,6 +727,7 @@ export default {
openPerformanceBondDialog(row) {
this.addForm('form2')
this.title1 = '新增履约保证金'
this.submitPerformanceBondDisabled = false
this.dialogFormVisible1 = true
this.projectId = row.项目流水号
this.tableData2 = []
@@ -741,6 +743,7 @@ export default {
submitPerformanceBondDialog(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.submitPerformanceBondDisabled = true
if (this.flag === 1) {
addPerformanceBond(this.projectId, this.form2.保证金金额, this.form2.保证金类型, this.form2.收回条件, this.form2.截止时间, this.form2.timer).then(response => {
if (response.data[0].result === '1') {
@@ -786,6 +789,7 @@ export default {
} else {
this.$message.error('操作失败')
}
this.submitPerformanceBondDisabled = false
})
} else if (this.flag === 2) {
editPerformanceBond(this.projectId, this.form2.保证金金额, this.form2.保证金类型, this.form2.收回条件, this.form2.截止时间, this.performanceBondCode, this.form2.timer).then(response => {
@@ -831,12 +835,14 @@ export default {
} else {
this.$message.error('操作失败')
}
this.submitPerformanceBondDisabled = false
})
}
}
})
},
openEditPerformanceBondDialog(row) {
this.submitPerformanceBondDisabled = false
this.dialogFormVisible1 = true
this.performanceBondCode = row.履约保证金流水号
this.form2.保证金金额 = row.履约保证金总额

14
src/views/MarketingCenter/SafetyMargin/index.vue
View File

@@ -435,7 +435,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" icon="el-icon-circle-close" @click="callOff('form')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form')">确 定</el-button>
<el-button :disabled="submit1Disabled" type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form')">确 定</el-button>
<!--<el-button @click="callOff('form')">取消</el-button>-->
<!--<el-button type="primary" @click="submit1('form')">确 定</el-button>-->
</div>
@@ -656,6 +656,7 @@ export default {
}
}
return {
submit1Disabled: false,
dateRange: '',
check1: '',
pickerOptions: {
@@ -950,6 +951,7 @@ export default {
this.projectName = row.项目名称
this.getTable(searchTable2, [this.PageCurrent2, this.PageSize2, this.code], ['tableData2', 'total2', 'tableData2Loading'])
this.dialogFormVisible5 = true
this.submit1Disabled = false
},
handleSizeChange(val) {
this.PageCurrent = 1
@@ -974,6 +976,7 @@ export default {
this.fetchTableData2()
},
addSafetyMargin(row) {
this.submit1Disabled = false
this.title = '新增安全保证金'
this.timetime = row.合同签订日期
this.changeTime()
@@ -982,6 +985,7 @@ export default {
this.addForm('form')
},
editSafetyMargin(row) {
this.submit1Disabled = false
this.editForm(row, 'form')
this.title = '编辑安全保证金'
this.dialogFormVisible1 = true
@@ -1005,6 +1009,7 @@ export default {
} else {
this.$message.error('添加失败')
}
this.submit1Disabled = false
})
},
editTableData1() {
@@ -1018,12 +1023,14 @@ export default {
} else {
this.$message.error('信息更新失败')
}
this.submit1Disabled = false
})
},
// 提交保证金信息添加或者修改
submit1(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.submit1Disabled = true
if (this.flag1 === 1) {
this.addTableData1()
this.flag1 = null
@@ -1081,6 +1088,7 @@ export default {
console.log(row)
this.changeTime1()
this.dialogFormVisible2 = true
this.submit1Disabled = false
this.code = row.安全保证金流水号
this.projectName = row.项目名称
this.maxMoney = parseFloat(row.应收回金额)
@@ -1099,11 +1107,13 @@ export default {
} else {
this.$message.error('扣款失败')
}
this.submit1Disabled = false
})
},
editWithdrawing(row) {
this.editForm(row, 'form3')
this.dialogFormVisible3 = true
this.submit1Disabled = false
this.maxMoney1 = parseFloat(this.SurplusAmount) + parseFloat(row.扣款金额)
this.form3.扣款金额 = row.扣款金额
this.form3.被扣款人 = row.被扣款人
@@ -1132,6 +1142,7 @@ export default {
this.form4.剩余金额 = parseFloat(row.应收回金额)
this.dialogFormVisible4 = true
this.form4.回收金额 = 0
this.submit1Disabled = false
},
submitTakeBack() {
TakeBack(this.code, this.form4.收回日期, this.form4.回收金额).then(response => {
@@ -1143,6 +1154,7 @@ export default {
} else {
this.$message.error('信息更新失败')
}
this.submit1Disabled = false
})
}
}

11
src/views/Outsourcing/OutFactoryMaintenance/index.vue
View File

@@ -109,7 +109,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="submit('form')" >确定</el-button>
<el-button :disabled="editType1_disable" type="primary" @click="submit('form')" >确定</el-button>
</div>
</el-dialog>
@@ -121,6 +121,7 @@ import { searchtable, edittype, handlechange, handledelete } from '@/api/Outsour
export default {
data() {
return {
editType1_disable: false,
loading0: false,
count1: 0,
count2: 0, // 清表单验证计数器
@@ -270,10 +271,12 @@ export default {
this.form.EquipmentCondition = ''
this.form.ManufacturerAbbreviation = ''
this.form.attention = ''
this.editType1_disable = false
this.dialogFormVisible = true
},
// 增加确定
editType() {
this.editType1_disable = true
edittype(this.form.ManufacturerNumber, this.form.ManufacturerName, this.form.ManufacturerAbbreviation, this.form.address, this.form.roleName, this.form.phNumber, this.form.Fax, this.form.Remarks, this.form.category, this.form.attention, this.form.EquipmentCondition).then(response => {
if (response.data[0].result === '1') {
this.$notify({
@@ -285,6 +288,7 @@ export default {
this.pageSize = 50
this.searchTable()
} else {
this.editType1_disable = false
this.$message.error('信息增加失败')
}
})
@@ -307,12 +311,14 @@ export default {
this.form.EquipmentCondition = row.设备情况
this.form.ManufacturerAbbreviation = row.外协厂家简称
this.form.attention = row.关注
this.dialogFormVisible = true
this.title1 = '编辑外协厂家'
this.CoManufacturerFlowNumber1 = row.外协厂家流水号
this.editType1_disable = false
this.dialogFormVisible = true
},
// 编辑确定
handleChange() {
this.editType1_disable = true
handlechange(this.CoManufacturerFlowNumber1, this.form.ManufacturerNumber, this.form.ManufacturerName, this.form.ManufacturerAbbreviation, this.form.address, this.form.roleName, this.form.phNumber, this.form.Fax, this.form.Remarks, this.form.category, this.form.attention, this.form.EquipmentCondition).then(response => {
if (response.data[0].result === '1') {
this.$notify({
@@ -322,6 +328,7 @@ export default {
})
this.searchTable()
} else {
this.editType1_disable = false
this.$message.error('信息修改失败')
}
})

14
src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
View File

@@ -155,7 +155,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff1('form1')">取消</el-button>
<el-button type="primary" @click="submit1('form1')" >确定</el-button>
<el-button :disabled="handleAdd1_disable" type="primary" @click="submit1('form1')" >确定</el-button>
</div>
</el-dialog>
@@ -182,7 +182,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff2('form2')">取消</el-button>
<el-button type="primary" @click="submit2('form2')" >确定</el-button>
<el-button :disabled="handleAdd2_disable" type="primary" @click="submit2('form2')" >确定</el-button>
</div>
</el-dialog>
</div>
@@ -193,6 +193,8 @@ import { searchtable, getInvoice, getPayment, AddType1, AddType2, handleChange1,
export default {
data() {
return {
handleAdd1_disable: false,
handleAdd2_disable: false,
ManufacturerName: '', // 外协厂家
外协厂家流水号: '',
外协厂家流水号_Select: '',
@@ -318,6 +320,7 @@ export default {
this.form1.开票时间 = ''
this.form1.开票金额 = ''
this.form1.外协厂家 = ''
this.handleAdd1_disable = false
this.dialogFormVisible1 = true
} else {
this.$message.error('请先选择外协厂家')
@@ -325,6 +328,7 @@ export default {
},
// 增加确定
AddType1() {
this.handleAdd1_disable = true
AddType1(this.外协厂家流水号, this.form1.发票号, this.form1.开票时间, this.form1.开票金额).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息增加成功')
@@ -348,10 +352,12 @@ export default {
this.form1.发票号 = row.发票号
this.form1.开票时间 = row.开票时间
this.form1.开票金额 = row.开票金额
this.handleAdd1_disable = false
this.dialogFormVisible1 = true
},
// 编辑确定
handleChange1() {
this.handleAdd1_disable = true
handleChange1(this.id_edit1, this.form1.发票号, this.form1.开票时间, this.form1.开票金额).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息修改成功')
@@ -419,12 +425,14 @@ export default {
this.title2 = '新增付款'
this.form2.付款时间 = ''
this.form2.付款金额 = ''
this.handleAdd2_disable = false
this.dialogFormVisible2 = true
} else {
this.$message.error('请先选择外协厂家')
}
},
AddType2() {
this.handleAdd2_disable = true
AddType2(this.外协厂家流水号, this.form2.付款金额, this.form2.付款时间).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息增加成功')
@@ -446,10 +454,12 @@ export default {
this.title2 = '编辑到票'
this.form2.付款金额 = row.付款金额
this.form2.付款时间 = row.付款日期
this.handleAdd2_disable = false
this.dialogFormVisible2 = true
},
// 编辑确定
handleChange2() {
this.handleAdd2_disable = true
handleChange2(this.id_edit2, this.form2.付款金额, this.form2.付款时间).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息修改成功')

17
src/views/Outsourcing/OutsourcingTaskExecution/index.vue
View File

@@ -144,7 +144,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="submit('form')">确定</el-button>
<el-button :disabled="handleAdd_disable" type="primary" @click="submit('form')">确定</el-button>
</div>
</el-dialog>
</div>
@@ -161,6 +161,7 @@ export default {
},
data() {
return {
handleAdd_disable: false,
工艺计划流水号: [],
isChecked: false,
bianliang: [],
@@ -393,6 +394,7 @@ export default {
})
this.form.运费 = 0
this.form.外协厂家 = ''
this.handleAdd_disable = false
this.dialogFormVisible = true
},
// 编辑外协任务单
@@ -401,10 +403,9 @@ export default {
this.$refs['form'].resetFields()
}
this.title = '编辑外协任务单'
this.dialogFormVisible = true
this.form.表单号 = row.表单号
this.form.运费 = row.运费
this.form.外协厂家 = row.外协厂家
this.form.外协厂家 = parseInt(row.外协厂家流水号)
this.form.下达任务日期 = row.任务下达日期
this.ManufactorNumber1 = row.外协厂家流水号
this.Number = row.外协加工任务单流水号
@@ -416,6 +417,8 @@ export default {
} else {
this.documentStatus = 2
}
this.handleAdd_disable = false
this.dialogFormVisible = true
},
// 提交
submit(formName) {
@@ -441,6 +444,7 @@ export default {
this.form.运费 = ''
this.$message.error('请输入数字')
} else {
this.handleAdd_disable = true
addTable(this.form.表单号, this.id, this.form.外协厂家, this.form.下达任务日期, this.form.运费).then(response => {
if (response.data[0].result === '1') {
this.$notify({
@@ -453,6 +457,7 @@ export default {
this.fetchData()
this.dialogFormVisible = false
} else {
this.handleAdd_disable = false
this.$message.error('信息添加失败')
}
})
@@ -460,13 +465,17 @@ export default {
},
// 提交编辑
submitEdit() {
this.handleAdd_disable = true
editData(this.Number, this.form.外协厂家, this.form.运费, this.Explain).then(response => {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
this.dialogFormVisible = false
this.title = ''
this.fetchData()
} else { this.$message.error('编辑失败') }
} else {
this.handleAdd_disable = false
this.$message.error('编辑失败')
}
})
},
// 删除任务单

7
src/views/Outsourcing/PreorderAssociation/index.vue
View File

@@ -58,7 +58,7 @@
</el-col>
<el-col style="width: auto">
<el-card>
<el-button size="small" type="success" plain style="margin: 10px" @click="saveRowPrice()">保存</el-button>
<el-button :disabled="saveRowPrice_disable" size="small" type="success" plain style="margin: 10px" @click="saveRowPrice()">保存</el-button>
<el-table v-loading="loading2" :data="tableData2" :row-class-name="tableData1ClassName" height="580" border element-loading-text="拼命加载中" size="small">
<el-table-column label="序号" type="index" align="center" width="50"/>
<el-table-column label="加工状态" width="100" align="center">
@@ -100,6 +100,7 @@ import { machine, getToolNum, getNum, searchTable, searchTable2, edit, edit2, sa
export default {
data() {
return {
saveRowPrice_disable: false,
entryNameValue: '',
entryName: [], // 项目名称
toolNumValue: '',
@@ -273,6 +274,7 @@ export default {
},
// 保存行价格
saveRowPrice() {
this.saveRowPrice_disable = true
this.count = 0
for (let i = 0; i < this.tableData2.length; i++) {
if (this.checkBox[i] === false) {
@@ -281,6 +283,7 @@ export default {
}
if (this.tableData2.length === 0) {
this.$message.error('请选择零件')
this.saveRowPrice_disable = false
} else {
if (this.count !== this.tableData2.length) {
this.a = 0
@@ -290,11 +293,13 @@ export default {
if (this.a === this.tableData2.length) {
this.$message.success('保存成功')
this.searchTable()
this.saveRowPrice_disable = false
}
})
}
} else {
this.$message.error('请选择需要外协工序')
this.saveRowPrice_disable = false
}
}
},

7
src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
View File

@@ -349,12 +349,14 @@
<div slot="footer" class="dialog-footer">
<el-button
v-show="title2==='创建外购备料单'"
:disabled="addPurchaseOrder_disable"
type="primary"
size="small"
icon="el-icon-check"
@click="submitAddPurchaseOrder">确定</el-button>
<el-button
v-show="title2==='编辑外购备料单'"
:disabled="addPurchaseOrder_disable"
type="primary"
size="small"
icon="el-icon-check"
@@ -376,6 +378,7 @@ export default {
name: '', // 采购计划
data() {
return {
addPurchaseOrder_disable: false,
dateRange: '',
checktime: '',
state: '',
@@ -693,6 +696,7 @@ export default {
this.form2.supplierNameValue = ''
this.form2.供应商名称 = ''
this.form2.计划完成日期 = ''
this.addPurchaseOrder_disable = false
this.dialogVisible2 = true
},
closedialog() {
@@ -706,6 +710,7 @@ export default {
submitAddPurchaseOrder() { // 新建采购单
this.$refs['form2'].validate((valid) => {
if (valid) {
this.addPurchaseOrder_disable = true
addPurchaseOrder(this.form2.采购单名称, this.form2.supplierNameValue, this.id, this.form2.计划完成日期).then(response => {
if (response.data[0].result === '1') {
this.$message.success('新建采购单成功')
@@ -727,11 +732,13 @@ export default {
this.form2.采购单名称 = row.采购单名称
this.form2.supplierNameValue = row.供应商
this.form2.计划完成日期 = row.计划完成日期
this.addPurchaseOrder_disable = false
this.dialogVisible2 = true
},
submitEditPurchaseOrder() {
this.$refs['form2'].validate((valid) => {
if (valid) {
this.addPurchaseOrder_disable = true
editPurchaseOrder(this.form2.采购计划流水号, this.form2.采购单名称, this.form2.supplierNameValue, this.form2.计划完成日期).then(response => {
if (response.data[0].result === '1') {
this.$message.success('修改采购单成功')

17
src/views/WorkshopProcurement/NewArrivalList/index.vue
View File

@@ -217,12 +217,14 @@
<div slot="footer" class="dialog-footer">
<el-button
v-show="title==='新增到货单'"
:disabled="addArrivalOrder_disable"
type="primary"
size="small"
icon="el-icon-check"
@click="submitAddArrivalOrder">保存</el-button>
<el-button
v-show="title==='编辑到货单'"
:disabled="addArrivalOrder_disable"
type="primary"
size="small"
icon="el-icon-check"
@@ -518,6 +520,7 @@ import { mapGetters } from 'vuex'
export default {
data() {
return {
addArrivalOrder_disable: false,
mark: false,
check1: 0,
check2: 0,
@@ -967,6 +970,7 @@ export default {
searchNewOrder().then(response => {
this.NewOrder = response.data[0].到货单号
})
this.addArrivalOrder_disable = false
this.title = '新增到货单'
this.form.备注 = ''
this.form.supplierNameValue = ''
@@ -985,12 +989,16 @@ export default {
submitAddArrivalOrder() {
this.$refs['form'].validate((valid) => {
if (valid) {
this.addArrivalOrder_disable = true
addPurchaseOrder(this.form.备注, this.form.supplierNameValue, this.form.日期).then(response => {
if (response.data[0].result === '1') {
this.$message.success('新建到货单成功')
this.searchTable4()
this.dialogVisible = false
} else { this.$message.error('新建到货单失败') }
} else {
this.addArrivalOrder_disable = false
this.$message.error('新建到货单失败')
}
})
} else {
return false
@@ -1005,17 +1013,22 @@ export default {
this.title = '编辑到货单'
this.form.备注 = row.备注
this.form.日期 = row.日期
this.addArrivalOrder_disable = false
this.dialogVisible = true
},
submitEditArrivalOrder() {
this.$refs['form'].validate((valid) => {
if (valid) {
this.addArrivalOrder_disable = true
editPurchaseOrder(this.form.备注, this.到货单流水号, this.form.日期).then(response => {
if (response.data[0].result === '1') {
this.$message.success('修改到货单成功')
this.searchTable4()
this.dialogVisible = false
} else { this.$message.error('修改到货单失败') }
} else {
this.$message.error('修改到货单失败')
this.addArrivalOrder_disable = false
}
})
} else {
return false

11
src/views/WorkshopProcurement/OfflineProcurement/index.vue
View File

@@ -233,6 +233,7 @@
<div style="margin-top: 20px">联系人:___________ 联系电话:___________ </div>
</div>
</el-card>
</div>
<el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="350px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="80px">
<el-form-item label="计划名称" prop="计划名称">
@@ -251,6 +252,7 @@
<div slot="footer" class="dialog-footer">
<el-button
v-show="title2==='创建外购备料计划'"
:disabled="addPurchaseOrder_disable"
type="primary"
size="small"
icon="el-icon-check"
@@ -264,7 +266,6 @@
</div>
</el-dialog>
</div>
</div>
</template>
<script>import { getMachines, getGroups, getTable, searchSupplier, addPurchaseOrder, editPurchaseOrder, deletePurchaseOrder, searchPurchaseOrder, AddMaterial, searchMX, saveWeight, deleteMX } from '@/api/WorkshopProcurement/OfflineProcurement'
@@ -275,6 +276,7 @@ export default {
name: '', // 项目总价查询
data() {
return {
addPurchaseOrder_disable: false,
check1: 0,
purchasingOrder: '',
supplierName: '',
@@ -512,18 +514,23 @@ export default {
this.form2.计划名称 = ''
this.form2.supplierNameValue = ''
this.title2 = '创建外购备料计划'
this.addPurchaseOrder_disable = false
this.dialogVisible2 = true
},
submitAddPurchaseOrder() { // 新建采购单
this.$refs['form2'].validate((valid) => {
if (valid) {
this.addPurchaseOrder_disable = true
this.supplierName = this.form2.supplierNameValue
addPurchaseOrder(this.form2.计划名称, this.form2.supplierNameValue).then(response => {
if (response.data[0].result === '1') {
this.$message.success('新建离线外购备料成功')
this.searchTable()
this.dialogVisible2 = false
} else { this.$message.error('新建离线外购备料失败') }
} else {
this.addPurchaseOrder_disable = false
this.$message.error('新建离线外购备料失败')
}
})
} else {
return false

21
src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
View File

@@ -223,7 +223,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisible1 = false">取消</el-button>
<el-button size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
<el-button :disabled="addTable1_disable" size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
</div>
</el-dialog>
@@ -277,7 +277,7 @@
</el-table-column>
</el-table>
<span>合计：<el-input v-positive="'float'" v-model="SUM" size="mini" type="number" style="width: 80px; margin: 10px 10px 0 10px" @change="Keeptwodecimalplaces"/>元</span>
<el-button type="primary" size="small" icon="el-icon-download" style="float:right;margin: 10px 10px 0 10px" @click="addMateriel">货票关联</el-button>
<el-button :disabled="aboutArrival_disable" type="primary" size="small" icon="el-icon-download" style="float:right;margin: 10px 10px 0 10px" @click="addMateriel">货票关联</el-button>
</el-dialog>
</div>
</template>
@@ -290,6 +290,8 @@ export default {
name: '', // 发票交接单
data() {
return {
addTable1_disable: false,
aboutArrival_disable: false,
dateRange: '',
pickerOptions: {
shortcuts: [{
@@ -476,13 +478,13 @@ export default {
this.$refs['form1'].resetFields()
}
this.tableData4 = []
this.dialogVisible1 = true
console.log(this.supplierNames)
this.form1.supplierNameValue = ''
this.form1.Number = ''
this.form1.invoiceTime = ''
this.form1.money = ''
this.form1.remark = ''
this.addTable1_disable = false
this.dialogVisible1 = true
},
submitAdd1(formName) {
this.$refs[formName].validate((valid) => {
@@ -490,6 +492,7 @@ export default {
if (this.arrest.length === 0) {
this.$message.warning('请勾选需要关联的到货单')
} else {
this.addTable1_disable = true
this.到货单流水号组 = []
this.arrest.map(v => {
this.到货单流水号组.push(v.到货单流水号)
@@ -500,6 +503,7 @@ export default {
this.dialogVisible1 = false
this.searchTable1()
} else {
this.addTable1_disable = false
this.$message.error('增加失败')
}
})
@@ -565,8 +569,9 @@ export default {
aboutArrival(row) {
this.Name = row.供应商
this.发票流水号 = row.发票流水号
this.dialogVisible = true
this.searchTable4()
this.aboutArrival_disable = false
this.dialogVisible = true
},
handleSelectionChange(val) {
this.SUM = 0
@@ -581,6 +586,7 @@ export default {
if (this.arrest.length === 0) {
this.$message.warning('请勾选需要关联的到货单')
} else {
this.aboutArrival_disable = true
this.到货单流水号组 = []
this.arrest.map(v => {
this.到货单流水号组.push(v.到货单流水号)
@@ -592,7 +598,10 @@ export default {
searchInvoiceDetail(this.发票流水号).then(response => {
this.gridData = response.data
})
} else { this.$message.error('关联失败') }
} else {
this.aboutArrival_disable = false
this.$message.error('关联失败')
}
})
}
},

7
src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
View File

@@ -349,7 +349,7 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" size="small" @click="submitApproval('form2')">确定</el-button>
<el-button :disabled="Open_disable" type="primary" size="small" @click="submitApproval('form2')">确定</el-button>
</div>
</el-dialog>
</div>
@@ -363,6 +363,7 @@ import QRCode from 'qrcode'
export default {
data() {
return {
Open_disable: false,
RMB: '',
TotalAmount: '',
check1: 0,
@@ -486,9 +487,10 @@ export default {
this.form2.审批是否通过 = 1
this.form2.未通过原因 = ''
this.disabled = true
this.dialogVisible3 = true
this.ProcurementContractNum = row.采购合同流水号
this.QGNUM = row.请购单流水号
this.Open_disable = false
this.dialogVisible3 = true
},
selectChange() {
if (this.form2.审批是否通过 === 2) {
@@ -500,6 +502,7 @@ export default {
submitApproval(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.Open_disable = true
submitApproval(this.ProcurementContractNum, this.form2.审批是否通过, this.form2.未通过原因, this.QGNUM).then(response => {
if (response.data[0].result === '1') {
this.$message.success('审批成功')

10
src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
View File

@@ -184,19 +184,21 @@
</el-table-column>
</el-table>
<span>合计：<el-input v-model="SUM" size="mini" style="width: 90px; margin: 10px 10px 0 10px"/>元</span>
<el-button type="primary" size="small" style="float:right;margin: 10px 10px 0 10px" icon="el-icon-check" @click="submitRequestFund">提交请款审批</el-button>
<el-button :disabled="requestFund_disable" type="primary" size="small" style="float:right;margin: 10px 10px 0 10px" icon="el-icon-check" @click="submitRequestFund">提交请款审批</el-button>
</el-dialog>
</div>
</div>
</div>
</template>
<script>import { searchRequestFund, searchOfflineContract, searchOfflineContract1, submitRequestFund, searchRequsetFundDetail, cancelRequestFund, deleteRequsetFundMX } from '@/api/WorkshopProcurement/RequestOutsourcingMaterials'
<script>
import { searchRequestFund, searchOfflineContract, searchOfflineContract1, submitRequestFund, searchRequsetFundDetail, cancelRequestFund, deleteRequsetFundMX } from '@/api/WorkshopProcurement/RequestOutsourcingMaterials'
import { mapGetters } from 'vuex'
export default {
name: '', // 离线合同
data() {
return {
requestFund_disable: false,
check1: 0,
check2: 0,
dateRange: '',
@@ -362,10 +364,11 @@ export default {
},
requestFund() { // 请款
// this.searchTable01()
this.dialogVisible2 = true
this.supplierValue = ''
this.fetchData() // 重新获取供应商
this.tableData01 = []
this.requestFund_disable = false
this.dialogVisible2 = true
},
searchTable01() { // 查询待请款
if (this.supplierValue !== null) {
@@ -391,6 +394,7 @@ export default {
},
submitRequestFund() { // 确认请款
if (this.supplierValue && this.contractGroup.length !== 0) {
this.requestFund_disable = true
submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => {
if (response.data[0].result === '1') {
this.$message.success('请款成功')