Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 2 years ago
parent
commit
861bfe0d56
  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

@ -51,7 +51,7 @@
<el-table-column fixed label="操作" align="center" width="220">
<template slot-scope="scope">
<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>
</template>
</el-table-column>
@ -88,6 +88,20 @@
<div-info v-show="viewState == 4" ref="divinfo" @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>
</template>
@ -117,6 +131,7 @@ export default {
viewState: 1, // 1 2 3 4
isSearchShow: false, //
tableLoading: false,
dialogVisible: false,
//
billType_list: [], //
//
@ -149,7 +164,10 @@ export default {
orgPath: ''
}
},
row: {}
formobj: {
sid: '',
cancalRemarks: ''
}
}
},
created() {
@ -178,19 +196,22 @@ export default {
this.$refs['divadd'].showEdit(row)
},
handleCancellation(row) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
req.cancal({ sid: row.sid }).then((res) => {
this.dialogVisible = true
this.cancalRemarks = ''
this.formobj.sid = row.sid
},
handleConfirm() {
if (this.formobj.cancalRemarks === '') {
this.$message({ showClose: true, type: 'error', message: '请填写作废说明' })
return
}
req.cancal(this.formobj).then((res) => {
if (res.success) {
this.dialogVisible = false
this.$message({ showClose: true, type: 'success', message: '操作成功' })
this.loadList()
}
})
})
},
handleLooK(row) {
this.viewState = 4

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

@ -44,7 +44,7 @@
<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>
<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>
</template>
</el-table-column>
@ -85,6 +85,20 @@
<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>
</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>
</template>
@ -118,6 +132,7 @@ export default {
viewState: 1, // 1 2 3 4
isSearchShow: false, //
tableLoading: false,
dialogVisible: false,
//
dataList: [],
btnList: [
@ -132,7 +147,6 @@ export default {
multipleSelection: [],
// sid
sids: [], // SID
sides: '', // sid
queryParams: {
current: 1,
size: 10,
@ -147,7 +161,10 @@ export default {
pcApplicationCode: ''
}
},
row: {}
formobj: {
sid: '',
cancalRemarks: ''
}
}
},
created() {
@ -213,8 +230,6 @@ export default {
aa.push(element.sid)
})
this.sids = aa
this.row = row
this.sides = this.sids.join() // sid
console.log('获取sids数组', this.sids)
},
toEdit(row) {
@ -229,19 +244,22 @@ export default {
this.$refs['divinfo'].showInfo(sid, row)
},
toTermination(row) {
const tip = '请确认是否终止该记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
req.cancal({ sid: row.sid }).then((res) => {
this.dialogVisible = true
this.formobj.sid = row.sid
this.formobj.cancalRemarks = ''
},
handleConfirm() {
if (this.formobj.cancalRemarks === '') {
this.$message({ showClose: true, type: 'error', message: '请填写终止说明' })
return
}
req.cancal(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '操作成功' })
this.dialogVisible = false
this.loadList()
}
})
})
},
hangleLook(row) {
this.viewState = 5
@ -272,16 +290,19 @@ export default {
},
//
loadList() {
const _this = this
this.tableLoading = true
req.listPage(this.queryParams).then(resp => {
console.log('查询列表', resp)
_this.tableLoading = false
this.tableLoading = false
if (resp.success) {
const data = resp.data
_this.queryParams.total = data.total
_this.dataList = data.records
this.queryParams.total = data.total
this.dataList = data.records
} else {
this.queryParams.total = 0
this.dataList = []
}
}).catch(() => {
_this.tableLoading = false
this.tableLoading = false
})
},
//

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

@ -113,6 +113,20 @@
<el-dialog :append-to-body="true" :visible.sync="dialogImgVisible">
<img width="100%" :src="dialogImageUrl" alt="" />
</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>
</template>
@ -150,7 +164,7 @@ export default {
isSearchShow: false,
searchxianshitit: '显示查询条件',
dialogImgVisible: false,
dialogFileVisible: false,
dialogVisible: false,
// -----------
tableKey: 0,
list: [],
@ -202,6 +216,10 @@ export default {
},
dialogImageUrl: '',
imgList: [],
formobj: {
sid: '',
cancalRemarks: ''
},
rules: {}
}
},
@ -307,19 +325,22 @@ export default {
})
},
handCancellation(row) {
const tip = '请确认是否作废该记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
req.cancel({ sid: row.sid }).then((res) => {
this.dialogVisible = true
this.cancalRemarks = ''
this.formobj.sid = row.sid
},
handleConfirm() {
if (this.formobj.cancalRemarks === '') {
this.$message({ showClose: true, type: 'error', message: '请填写作废说明' })
return
}
req.cancel(this.formobj).then((res) => {
if (res.success) {
this.dialogVisible = false
this.$message({ showClose: true, type: 'success', message: '操作成功' })
this.getList()
}
})
})
},
handleGetCheck(row) {
this.dialogImgVisible = true

Loading…
Cancel
Save