wilson
/
krd-srm-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
常熟吴彦祖 1 month ago
parent
03c5614170 b1e4203d62
commit
0ffa444cb9
5 changed files with 37 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/api/supplier/purQuotation.js
  2. 4
      src/views/modules/supplier/purDetailList.vue
  3. 41
      src/views/modules/supplier/purHeaderList.vue
  4. 3
      src/views/modules/supplier/quoPurDetailList.vue
  5. 3
      src/views/modules/supplier/supPurReplyHistList.vue

2
src/api/supplier/purQuotation.js
View File

@ -4,6 +4,8 @@ export const searchPurHeaderList = (data) => createAPI(`/supplier/getPurHeaderLi
export const createPurHeader = (data) => createAPI(`/supplier/savePurHeader`, 'post', data) export const createPurHeader = (data) => createAPI(`/supplier/savePurHeader`, 'post', data)
export const updatePurHeader = (data) => createAPI(`/supplier/savePurHeader`, 'post', data) export const updatePurHeader = (data) => createAPI(`/supplier/savePurHeader`, 'post', data)
export const deletePurHeader = (data) => createAPI(`/supplier/delPurHeader`, 'post', data) export const deletePurHeader = (data) => createAPI(`/supplier/delPurHeader`, 'post', data)
export const updatePurHeaderStatus = (data) => createAPI(`/supplier/updatePurHeaderStatus`, 'post', data)
//询价提交 //询价提交
export const updatePurDetailStatus = (data) => createAPI(`/supplier/updatePurDetailStatus`, 'post', data) export const updatePurDetailStatus = (data) => createAPI(`/supplier/updatePurDetailStatus`, 'post', data)

4
src/views/modules/supplier/purDetailList.vue
View File

@ -45,6 +45,7 @@
<el-option label="已接受" value="已接受"></el-option> <el-option label="已接受" value="已接受"></el-option>
<el-option label="未接受" value="未接受"></el-option> <el-option label="未接受" value="未接受"></el-option>
<el-option label="已拒绝" value="已拒绝"></el-option> <el-option label="已拒绝" value="已拒绝"></el-option>
<el-option label="已关闭" value="已关闭"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=" "> <el-form-item label=" ">
@ -161,6 +162,7 @@ export default {
}, },
// 表格列配置 // 表格列配置
columnArray1: [ columnArray1: [
{ columnProp: 'status', columnLabel: '状态', columnWidth: '80', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'orderNo', columnLabel: '询价单号', columnWidth: '120', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'orderNo', columnLabel: '询价单号', columnWidth: '120', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'itemNo', columnLabel: '序号', columnWidth: '60', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'itemNo', columnLabel: '序号', columnWidth: '60', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'uploadFlag', columnLabel: '是否上传', columnWidth: '80', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'uploadFlag', columnLabel: '是否上传', columnWidth: '80', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
@ -171,7 +173,7 @@ export default {
{ columnProp: 'umid', columnLabel: '计量单位', columnWidth: '80', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'umid', columnLabel: '计量单位', columnWidth: '80', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'spec', columnLabel: '规格型号', columnWidth: '150', headerAlign: 'center', align: 'left', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'spec', columnLabel: '规格型号', columnWidth: '150', headerAlign: 'center', align: 'left', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'qty', columnLabel: '询价数量', columnWidth: '100', headerAlign: 'center', align: 'right', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'qty', columnLabel: '询价数量', columnWidth: '100', headerAlign: 'center', align: 'right', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'status', columnLabel: '状态', columnWidth: '80', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'materialCost', columnLabel: '材料费用', columnWidth: '100', headerAlign: 'center', align: 'right', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'materialCost', columnLabel: '材料费用', columnWidth: '100', headerAlign: 'center', align: 'right', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'produceFee', columnLabel: '加工费', columnWidth: '100', headerAlign: 'center', align: 'right', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'produceFee', columnLabel: '加工费', columnWidth: '100', headerAlign: 'center', align: 'right', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'surfaceFee', columnLabel: '表面处理费', columnWidth: '100', headerAlign: 'center', align: 'right', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'surfaceFee', columnLabel: '表面处理费', columnWidth: '100', headerAlign: 'center', align: 'right', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },

41
src/views/modules/supplier/purHeaderList.vue
View File

@ -15,11 +15,10 @@
<el-form-item :label="'状态'"> <el-form-item :label="'状态'">
<el-select v-model="searchData.status" placeholder="请选择" style="width:100px" clearable> <el-select v-model="searchData.status" placeholder="请选择" style="width:100px" clearable>
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option label="待提交" value="待提交"></el-option>
<el-option label="待报价" value="待报价"></el-option> <el-option label="待报价" value="待报价"></el-option>
<el-option label="已报价" value="已报价"></el-option> <el-option label="已报价" value="已报价"></el-option>
<el-option label="已接受" value="已接受"></el-option>
<el-option label="未接受" value="未接受"></el-option>
<el-option label="已拒绝" value="已拒绝"></el-option>
<el-option label="已关闭" value="已关闭"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=" "> <el-form-item label=" ">
@ -31,13 +30,15 @@
<!-- 主表：询价单列表 --> <!-- 主表：询价单列表 -->
<el-table :data="dataList" :height="tableHeight" border highlight-current-row @row-click="selectInquiry" v-loading="loading" style="width:100%"> <el-table :data="dataList" :height="tableHeight" border highlight-current-row @row-click="selectInquiry" v-loading="loading" style="width:100%">
<el-table-column fixed="right" label="操作" header-align="center" align="center" width="140"> <el-table-column fixed="right" label="操作" header-align="center" align="center" width="140">
<template slot-scope="scope" v-if="scope.row.status === '待提交'">
<a class="customer-a" @click.stop="openDialog(scope.row)">编辑 |</a>
<a class="customer-a" @click.stop="handleDelete(scope.row)">删除</a>
<a class="customer-a" @click="updateQuoDetail(scope.row)">提交</a>
<template slot-scope="scope" >
<a class="customer-a" v-if="scope.row.status === '待提交'" @click.stop="openDialog(scope.row)">编辑 |</a>
<a class="customer-a" v-if="scope.row.status === '待提交'" @click.stop="handleDelete(scope.row)">删除</a>
<a class="customer-a" v-if="scope.row.status === '待提交'" @click="updateQuoDetail(scope.row)">提交</a>
<a class="customer-a" v-if="scope.row.status != '已关闭'" @click="closePurHeader(scope.row)">关闭</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="orderNo" label="询价单号" min-width="140" header-align="center" align="left" show-overflow-tooltip fixed="left" />
<el-table-column prop="status" label="状态" min-width="80" header-align="center" align="center" show-overflow-tooltip />
<el-table-column prop="orderNo" label="询价单号" min-width="140" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="supplierId" label="供应商编码" min-width="120" header-align="center" align="center" show-overflow-tooltip /> <el-table-column prop="supplierId" label="供应商编码" min-width="120" header-align="center" align="center" show-overflow-tooltip />
<el-table-column prop="supplierName" label="供应商名称" min-width="180" header-align="center" align="left" show-overflow-tooltip /> <el-table-column prop="supplierName" label="供应商名称" min-width="180" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="orderDate" label="询价日期" min-width="120" header-align="center" align="center" show-overflow-tooltip /> <el-table-column prop="orderDate" label="询价日期" min-width="120" header-align="center" align="center" show-overflow-tooltip />
@ -54,7 +55,7 @@
<el-table-column prop="faxNo" label="传真" min-width="120" header-align="center" align="center" show-overflow-tooltip /> <el-table-column prop="faxNo" label="传真" min-width="120" header-align="center" align="center" show-overflow-tooltip />
<el-table-column prop="contact" label="联系人" min-width="100" header-align="center" align="center" show-overflow-tooltip /> <el-table-column prop="contact" label="联系人" min-width="100" header-align="center" align="center" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" min-width="180" header-align="center" align="left" show-overflow-tooltip /> <el-table-column prop="remark" label="备注" min-width="180" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="status" label="状态" min-width="80" header-align="center" align="center" show-overflow-tooltip />
</el-table> </el-table>
<!-- 分页 --> <!-- 分页 -->
@ -381,11 +382,11 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<!-- <el-col :span="24">
<el-form-item label="Remark" class="auto"> <el-form-item label="Remark" class="auto">
<el-input type="textarea" v-model="ossForm.remark" resize="none" :autosize="{minRows: 3, maxRows: 3}"></el-input> <el-input type="textarea" v-model="ossForm.remark" resize="none" :autosize="{minRows: 3, maxRows: 3}"></el-input>
</el-form-item> </el-form-item>
</el-col>
</el-col> -->
</el-row> </el-row>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -410,6 +411,7 @@ import {
createPurHeader, createPurHeader,
updatePurHeader, updatePurHeader,
deletePurHeader, deletePurHeader,
updatePurHeaderStatus,
searchMaterialList, searchMaterialList,
createMaterial, createMaterial,
updateMaterial, updateMaterial,
@ -892,8 +894,6 @@ export default {
}) })
}, },
handleDelete(row) { handleDelete(row) {
this.$confirm('确定删除询价单: ' + row.orderNo + ' ?', '提示', { type: 'warning' }).then(() => { this.$confirm('确定删除询价单: ' + row.orderNo + ' ?', '提示', { type: 'warning' }).then(() => {
deletePurHeader({ id: row.id }).then(({data}) => { deletePurHeader({ id: row.id }).then(({data}) => {
@ -928,6 +928,21 @@ export default {
}).catch(() => {}) }).catch(() => {})
}, },
closePurHeader(row) {
this.$confirm('确定关闭询价单: ' + row.orderNo + ' ?', '提示', { type: 'warning' }).then(() => {
updatePurHeaderStatus({ id: row.id,status: '已关闭' }).then(({data}) => {
if (data && data.code === 0) {
this.$message.success('操作成功')
this.getList()
} else {
this.$message.error((data && data.msg) || '操作失败')
}
}).catch(err => {
this.$message.error('操作失败: ' + err.message)
})
}).catch(() => {})
},
// 物料操作 // 物料操作
openMaterialDialog(row) { openMaterialDialog(row) {
if (!this.currentInquiry) { if (!this.currentInquiry) {

3
src/views/modules/supplier/quoPurDetailList.vue
View File

@ -314,6 +314,7 @@ export default {
}, },
// 表格列配置 // 表格列配置
columnArray1: [ columnArray1: [
{ columnProp: 'status', columnLabel: '状态', columnWidth: '80', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'orderNo', columnLabel: '询价单号', columnWidth: '120', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'orderNo', columnLabel: '询价单号', columnWidth: '120', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'orderDate', columnLabel: '询价日期', columnWidth: '100', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'orderDate', columnLabel: '询价日期', columnWidth: '100', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'wantReplyDate', columnLabel: '要求报价日期', columnWidth: '100', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'wantReplyDate', columnLabel: '要求报价日期', columnWidth: '100', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
@ -324,7 +325,7 @@ export default {
{ columnProp: 'spec', columnLabel: '规格型号', columnWidth: '150', headerAlign: 'center', align: 'left', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'spec', columnLabel: '规格型号', columnWidth: '150', headerAlign: 'center', align: 'left', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'qty', columnLabel: '询价数量', columnWidth: '100', headerAlign: 'center', align: 'right', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'qty', columnLabel: '询价数量', columnWidth: '100', headerAlign: 'center', align: 'right', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'remark2', columnLabel: '特殊要求', columnWidth: '80', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'remark2', columnLabel: '特殊要求', columnWidth: '80', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'status', columnLabel: '状态', columnWidth: '80', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'buyer', columnLabel: '采购员', columnWidth: '120', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'buyer', columnLabel: '采购员', columnWidth: '120', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'paymentTerm', columnLabel: '付款方式', columnWidth: '80', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'paymentTerm', columnLabel: '付款方式', columnWidth: '80', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'deliveryTerm', columnLabel: '交易条款', columnWidth: '120', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true }, { columnProp: 'deliveryTerm', columnLabel: '交易条款', columnWidth: '120', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },

3
src/views/modules/supplier/supPurReplyHistList.vue
View File

@ -558,7 +558,8 @@ export default {
orderNo: '', orderNo: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
status: ''
status: '',
notExistsStatus: '已关闭'
}, },
dialogVisible: false, dialogVisible: false,

Write Preview
Loading…
Cancel
Save