yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 2 years ago
parent
324c1c6ede ed4a2e7d56
commit
861bfe0d56
3 changed files with 114 additions and 51 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. 41
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
  2. 59
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
  3. 39
      anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue

41
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
View File

@ -51,7 +51,7 @@
<el-table-column fixed label="操作" align="center" width="220"> <el-table-column fixed label="操作" align="center" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="small" :disabled="scope.row.offlineDate !==''" @click="handleUpdate(scope.row)">编辑</el-button> <el-button type="primary" size="small" :disabled="scope.row.offlineDate !==''" @click="handleUpdate(scope.row)">编辑</el-button>
<el-button type="danger" size="small" :disabled="scope.row.offlineDate !==''" @click="handleCancellation(scope.row)">作废</el-button> <el-button type="danger" size="small" :disabled="scope.row.offlineDate !=='' || scope.row.orderStatus == '已作废'" @click="handleCancellation(scope.row)">作废</el-button>
<el-button type="primary" size="small" @click="handleLooK(scope.row)">查看</el-button> <el-button type="primary" size="small" @click="handleLooK(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -88,6 +88,20 @@
<div-info v-show="viewState == 4" ref="divinfo" @doback="resetState"/> <div-info v-show="viewState == 4" ref="divinfo" @doback="resetState"/>
<!-- 车辆详情标准页面--> <!-- 车辆详情标准页面-->
<vehicleconfiguration v-show="viewState == 5" ref="divPeizhi" @doback="resetState"/> <vehicleconfiguration v-show="viewState == 5" ref="divPeizhi" @doback="resetState"/>
<!-- 作废说明 -->
<el-dialog title="作废说明" :append-to-body="true" :visible.sync="dialogVisible">
<el-form ref="" :model="formobj" class="formadd">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24" class="tleftb">
<el-form-item><el-input v-model="formobj.cancalRemarks" clearable placeholder=""/></el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" size="small" @click="handleConfirm">确 定</el-button>
<el-button size="small" @click="dialogVisible = false">取 消</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
@ -117,6 +131,7 @@ export default {
viewState: 1, // 1、列表 2、添加 3、修改 4、查看 viewState: 1, // 1、列表 2、添加 3、修改 4、查看
isSearchShow: false, // 显示隐藏 isSearchShow: false, // 显示隐藏
tableLoading: false, tableLoading: false,
dialogVisible: false,
// 下拉框 // 下拉框
billType_list: [], // 单据类型 billType_list: [], // 单据类型
// 列表数据 // 列表数据
@ -149,7 +164,10 @@ export default {
orgPath: '' orgPath: ''
} }
}, },
row: {} formobj: {
sid: '',
cancalRemarks: ''
}
} }
}, },
created() { created() {
@ -178,19 +196,22 @@ export default {
this.$refs['divadd'].showEdit(row) this.$refs['divadd'].showEdit(row)
}, },
handleCancellation(row) { handleCancellation(row) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?' this.dialogVisible = true
this.$confirm(tip, '提示', { this.cancalRemarks = ''
confirmButtonText: '确定', this.formobj.sid = row.sid
cancelButtonText: '取消', },
type: 'warning' handleConfirm() {
}).then(() => { if (this.formobj.cancalRemarks === '') {
req.cancal({ sid: row.sid }).then((res) => { this.$message({ showClose: true, type: 'error', message: '请填写作废说明' })
return
}
req.cancal(this.formobj).then((res) => {
if (res.success) { if (res.success) {
this.dialogVisible = false
this.$message({ showClose: true, type: 'success', message: '操作成功' }) this.$message({ showClose: true, type: 'success', message: '操作成功' })
this.loadList() this.loadList()
} }
}) })
})
}, },
handleLooK(row) { handleLooK(row) {
this.viewState = 4 this.viewState = 4

59
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
View File

@ -44,7 +44,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true" type="primary" size="small" @click="toEdit(scope.row)">办理 <el-button :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true" type="primary" size="small" @click="toEdit(scope.row)">办理
</el-button> </el-button>
<el-button type="danger" :disabled="scope.row.nodeState =='已办结' ? true : scope.row.nodeState == '已终止' ? true : false" size="small" @click="toTermination(scope.row)">终止</el-button> <el-button type="danger" :disabled="scope.row.nodeState =='已办结' ? true : scope.row.nodeState == '终止' ? true : false" size="small" @click="toTermination(scope.row)">终止</el-button>
<el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button> <el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -85,6 +85,20 @@
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center> <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe> <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog> </el-dialog>
<!-- 作废说明 -->
<el-dialog title="终止说明" :append-to-body="true" :visible.sync="dialogVisible">
<el-form ref="" :model="formobj" class="formadd">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24" class="tleftb">
<el-form-item><el-input v-model="formobj.cancalRemarks" clearable placeholder=""/></el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" size="small" @click="handleConfirm">确 定</el-button>
<el-button size="small" @click="dialogVisible = false">取 消</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
@ -118,6 +132,7 @@ export default {
viewState: 1, // 1、列表 2、添加 3、修改 4、查看 viewState: 1, // 1、列表 2、添加 3、修改 4、查看
isSearchShow: false, // 显示隐藏 isSearchShow: false, // 显示隐藏
tableLoading: false, tableLoading: false,
dialogVisible: false,
// 列表数据 // 列表数据
dataList: [], dataList: [],
btnList: [ btnList: [
@ -132,7 +147,6 @@ export default {
multipleSelection: [], multipleSelection: [],
// sid数组 // sid数组
sids: [], // 用于导出的时候保存已选择SID sids: [], // 用于导出的时候保存已选择SID
sides: '', // 一条数据的sid
queryParams: { queryParams: {
current: 1, current: 1,
size: 10, size: 10,
@ -147,7 +161,10 @@ export default {
pcApplicationCode: '' pcApplicationCode: ''
} }
}, },
row: {} formobj: {
sid: '',
cancalRemarks: ''
}
} }
}, },
created() { created() {
@ -213,8 +230,6 @@ export default {
aa.push(element.sid) aa.push(element.sid)
}) })
this.sids = aa this.sids = aa
this.row = row
this.sides = this.sids.join() // 将sid数组的元素转化成字符串
console.log('获取sids数组', this.sids) console.log('获取sids数组', this.sids)
}, },
toEdit(row) { toEdit(row) {
@ -229,19 +244,22 @@ export default {
this.$refs['divinfo'].showInfo(sid, row) this.$refs['divinfo'].showInfo(sid, row)
}, },
toTermination(row) { toTermination(row) {
const tip = '请确认是否终止该记录?' this.dialogVisible = true
this.$confirm(tip, '提示', { this.formobj.sid = row.sid
confirmButtonText: '确定', this.formobj.cancalRemarks = ''
cancelButtonText: '取消', },
type: 'warning' handleConfirm() {
}).then(() => { if (this.formobj.cancalRemarks === '') {
req.cancal({ sid: row.sid }).then((res) => { this.$message({ showClose: true, type: 'error', message: '请填写终止说明' })
return
}
req.cancal(this.formobj).then((res) => {
if (res.success) { if (res.success) {
this.$message({ showClose: true, type: 'success', message: '操作成功' }) this.$message({ showClose: true, type: 'success', message: '操作成功' })
this.dialogVisible = false
this.loadList() this.loadList()
} }
}) })
})
}, },
hangleLook(row) { hangleLook(row) {
this.viewState = 5 this.viewState = 5
@ -272,16 +290,19 @@ export default {
}, },
// 加载分页列表 // 加载分页列表
loadList() { loadList() {
const _this = this
this.tableLoading = true this.tableLoading = true
req.listPage(this.queryParams).then(resp => { req.listPage(this.queryParams).then(resp => {
console.log('查询列表', resp) this.tableLoading = false
_this.tableLoading = false if (resp.success) {
const data = resp.data const data = resp.data
_this.queryParams.total = data.total this.queryParams.total = data.total
_this.dataList = data.records this.dataList = data.records
} else {
this.queryParams.total = 0
this.dataList = []
}
}).catch(() => { }).catch(() => {
_this.tableLoading = false this.tableLoading = false
}) })
}, },
// 序号 // 序号

39
anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue
View File

@ -113,6 +113,20 @@
<el-dialog :append-to-body="true" :visible.sync="dialogImgVisible"> <el-dialog :append-to-body="true" :visible.sync="dialogImgVisible">
<img width="100%" :src="dialogImageUrl" alt="" /> <img width="100%" :src="dialogImageUrl" alt="" />
</el-dialog> </el-dialog>
<!-- 作废说明 -->
<el-dialog title="作废说明" :append-to-body="true" :visible.sync="dialogVisible">
<el-form ref="" :model="formobj" class="formadd">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24" class="tleftb">
<el-form-item><el-input v-model="formobj.cancalRemarks" clearable placeholder=""/></el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" size="small" @click="handleConfirm">确 定</el-button>
<el-button size="small" @click="dialogVisible = false">取 消</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
@ -150,7 +164,7 @@ export default {
isSearchShow: false, isSearchShow: false,
searchxianshitit: '显示查询条件', searchxianshitit: '显示查询条件',
dialogImgVisible: false, dialogImgVisible: false,
dialogFileVisible: false, dialogVisible: false,
// 查询条件 ----------- // 查询条件 -----------
tableKey: 0, tableKey: 0,
list: [], list: [],
@ -202,6 +216,10 @@ export default {
}, },
dialogImageUrl: '', dialogImageUrl: '',
imgList: [], imgList: [],
formobj: {
sid: '',
cancalRemarks: ''
},
rules: {} rules: {}
} }
}, },
@ -307,19 +325,22 @@ export default {
}) })
}, },
handCancellation(row) { handCancellation(row) {
const tip = '请确认是否作废该记录?' this.dialogVisible = true
this.$confirm(tip, '提示', { this.cancalRemarks = ''
confirmButtonText: '确定', this.formobj.sid = row.sid
cancelButtonText: '取消', },
type: 'warning' handleConfirm() {
}).then(() => { if (this.formobj.cancalRemarks === '') {
req.cancel({ sid: row.sid }).then((res) => { this.$message({ showClose: true, type: 'error', message: '请填写作废说明' })
return
}
req.cancel(this.formobj).then((res) => {
if (res.success) { if (res.success) {
this.dialogVisible = false
this.$message({ showClose: true, type: 'success', message: '操作成功' }) this.$message({ showClose: true, type: 'success', message: '操作成功' })
this.getList() this.getList()
} }
}) })
})
}, },
handleGetCheck(row) { handleGetCheck(row) {
this.dialogImgVisible = true this.dialogImgVisible = true

Write Preview
Loading…
Cancel
Save