- {{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
diff --git a/supervise-risk-ui/src/views/risk/RiskManage/category.vue b/supervise-risk-ui/src/views/risk/RiskManage/category.vue
index 25f2b2ef..14f4b5b3 100644
--- a/supervise-risk-ui/src/views/risk/RiskManage/category.vue
+++ b/supervise-risk-ui/src/views/risk/RiskManage/category.vue
@@ -1,7 +1,7 @@
- {{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
diff --git a/supervise-risk-ui/src/views/risk/bjzx.vue b/supervise-risk-ui/src/views/risk/bjzx.vue
new file mode 100644
index 00000000..ffc7f96b
--- /dev/null
+++ b/supervise-risk-ui/src/views/risk/bjzx.vue
@@ -0,0 +1,329 @@
+
+ 撤销审核
-
@@ -76,9 +76,9 @@
@@ -147,7 +147,7 @@
-
@@ -156,8 +156,8 @@
-
-
+
@@ -167,7 +167,7 @@
-
+
-
@@ -197,12 +197,12 @@
-
+
+ v-for="custName in storehouseList"
+ :key="custName.name"
+ :label="custName.name"
+ :value="custName.name">
@@ -215,7 +215,7 @@
-
+
商品信息添加
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
+
+
+
-
+
删除
@@ -272,52 +343,6 @@
确 定
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -327,9 +352,12 @@ export default {
data () {
return {
queryInfo: {
- query: '',
- pageNum: 1,
- pageSize: 10
+ total: 0,
+ current: 1,
+ size: 10,
+ params: {
+
+ }
},
total: 0,
purchaseList: [],
@@ -345,12 +373,18 @@ export default {
purchaseId: '',
product: '',
barCode: '',
+ purchaseDate:'',
+ purchaseNo:'',
supplier: '',
+ storehouseName:'',
+ supplierName:'',
count: '',
storehouse: '',
status: '',
- commodityList:[]
+ products:[]
},
+ pirce:'',
+ num:'',
rules: {
product: [
{ required: true, message: '请输入商品名', trigger: 'blur' }
@@ -367,32 +401,54 @@ export default {
}
}
},
+ created(){
+ this.heji()
+ },
methods: {
handleSizeChange (val) {
- this.queryInfo.pageSize = val
+ this.queryInfo.size = val
this.getPurchaseList()
},
handleCurrentChange (val) {
- this.queryInfo.pageNum = val
+ this.queryInfo.current = val
this.getPurchaseList()
},
async getPurchaseList () {
- const { data: result } = await this.$http.get('/purchase/list', { params: this.queryInfo })
- if (result.status !== 200) return this.$message.error('获取列表失败')
- this.total = result.data.total
- this.purchaseList = result.data.rows
+ const { data: result } = await this.$http.post('/purchasenew/listPage', { params: this.queryInfo })
+ if (result.code == 200){
+ this.total = result.data.total
+ this.purchaseList = result.data.records
+ // this.$message({ type: 'success', message: result.msg, showClose: true })
+ }
},
addPurchase () {
- this.$refs.addPurchaseRuleForm.validate(async validate => {
+ this.$refs.dataForm.validate(async validate => {
if (!validate) return this.$message.error('请填写必填项')
this.purchaseForm.status = '待审核'
- const { data: result } = await this.$http.post('/purchase/addPurchase', this.purchaseForm)
- if (result.status !== 200) return this.$message.error('添加订单失败')
- this.getPurchaseList()
- this.addPurchaseDialogVisible = false
+ const { data: result } = await this.$http.post('/purchasenew/save', this.purchaseForm)
+ if (result.code == 200) {
+ this.getPurchaseList()
+ this.addPurchaseDialogVisible = false
+ this.$message({ type: 'success', message: result.msg, showClose: true })
+ }
+ this.purchaseForm={
+ purchaseId: '',
+ product: '',
+ barCode: '',
+ purchaseDate:'',
+ purchaseNo:'',
+ supplier: '',
+ storehouseName:'',
+ supplierName:'',
+ count: '',
+ storehouse: '',
+ status: '',
+ products:[]
+
+ }
})
},
@@ -406,7 +462,7 @@ export default {
openAddPurchaseDialog () {
this.addPurchaseDialogVisible = true
var now = new Date()
- this.purchaseForm.purchaseId = 'IP' + now.getTime()
+ this.purchaseForm.purchaseNo = 'IP' + now.getTime()
console.log('IP' + now.getTime())
if (this.productList2.length == 0) this.productList2 = this.productList
},
@@ -432,26 +488,35 @@ export default {
},
async deletePurchase (purchase) {
- if (purchase.status !== '待审核') return this.$message.error('订单' + purchase.purchaseId + '进行中')
- const result = await this.$confirm('此操作将永久删除订单' + purchase.purchaseId + ', 是否继续?', '提示', {
+ if (purchase.status !== '待审核') return this.$message.error('订单' + purchase.purchaseNo + '进行中')
+ const result = await this.$confirm('此操作将永久删除订单' + purchase.purchaseNo + ', 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).catch(error => error)
if (result !== 'confirm') return this.$message.info('用户取消操作')
- const { data: resultDB } = await this.$http.delete(`/purchase/delete/${purchase.purchaseId}`)
+ const { data: resultDB } = await this.$http.delete(`/purchase/delete/${purchase.purchaseNo}`)
if (resultDB.status !== 200) return this.$message.error('删除订单失败')
this.getPurchaseList()
this.$message.success('订单删除成功')
},
- open (purchase) {
- if (purchase.status !== '待审核') return this.$message.error('订单' + purchase.purchaseId + '进行中')
- this.purchaseForm = purchase
- this.updataPurchaseDialogVisible = true
- if (this.productList2.length == 0) this.productList2 = this.productList
+ async open (purchase) {
+ // if (purchase.status !== '待审核') return this.$message.error('订单' + purchase.purchaseNo + '进行中')
+ this.addPurchaseDialogVisible = true
+ const _this = this
+ const { data: result } = await this.$http.get(`/purchasenew/fetchDetailsBySid/${purchase.sid}`)
+ if (result.code==200) {
+ // _this.purchaseForm.purchaseDate=result.data.purchaseDate
+ // _this.purchaseForm.purchaseNo=result.data.purchaseNo
+ // _this.purchaseForm.supplierName=result.data.supplierName
+ // _this.purchaseForm.purchasePerson=result.data.purchasePerson
+ // _this.purchaseForm.custName=result.data.custName
+ // _this.purchaseForm.storehouseName=result.data.storehouseName
+ _this.purchaseForm=result.data
+ }
+ // if (this.productList2.length == 0) this.productList2 = this.productList
},
-
checkUpdataPurchase () {
this.$refs.updataPurchaseRuleForm.validate(validate => {
if (!validate) return this.$message.error('请填写必填项')
@@ -490,11 +555,11 @@ export default {
if (this.selectPurchaseList[i].status === '已审核') {
this.selectPurchaseList[i].status = '待审核'
this.updataPurchase(this.selectPurchaseList[i])
- this.$message.success('订单' + this.selectPurchaseList[i].purchaseId + '撤销审核成功')
+ this.$message.success('订单' + this.selectPurchaseList[i].purchaseNo + '撤销审核成功')
} else if (this.selectPurchaseList[i].status === '待审核') {
- this.$message.error('订单' + this.selectPurchaseList[i].purchaseId + '未审核')
+ this.$message.error('订单' + this.selectPurchaseList[i].purchaseNo + '未审核')
} else {
- this.$message.error('订单' + this.selectPurchaseList[i].purchaseId + '进行中')
+ this.$message.error('订单' + this.selectPurchaseList[i].purchaseNo + '进行中')
}
}
},
@@ -502,7 +567,9 @@ export default {
},
add(){
+ this.purchaseForm.products.push({
+ })
},
// 序号
indexMethod(index) {
@@ -510,7 +577,29 @@ export default {
// var pageindex = index + 1 + pagestart
return index + 1
},
-
+ doCommoditylDel(index) {
+
+ const tip = '请确认是否删除所选记录?'
+ this.$confirm(tip, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.purchaseForm.products.splice(index, 1);
+ })
+ },
+ getList(value){
+ this.pirce=value
+ console.log(this.pirce);
+ },
+ getLists(value){
+ this.num=value
+ },
+ heji(){
+ if(this.pirce && this.num){
+ console.log(666);
+ }
+ }
},
mounted () {
+
+
+
+
+
+
\ No newline at end of file
diff --git a/supervise-risk-ui/src/views/risk/riskCljl.vue b/supervise-risk-ui/src/views/risk/riskCljl.vue
new file mode 100644
index 00000000..67fee549
--- /dev/null
+++ b/supervise-risk-ui/src/views/risk/riskCljl.vue
@@ -0,0 +1,338 @@
+
+
+
+
+
+
+
+
+
+
+ {{ searchxianshitit }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+ 工商风险列表
+
+
+
+
+
+
+
+ 处理
+ 上报
+
+
+
+
+
+
+
+ 待处理
+ 处理中
+ 已办结
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/warehousing-system/project_web/src/components/instorehouse/purchase.vue b/warehousing-system/project_web/src/components/instorehouse/purchase.vue
index 5e59e079..e2945f5d 100644
--- a/warehousing-system/project_web/src/components/instorehouse/purchase.vue
+++ b/warehousing-system/project_web/src/components/instorehouse/purchase.vue
@@ -13,7 +13,7 @@
+
+
+
+
+
+
+
+
+ {{ searchxianshitit }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+ 工商风险列表
+
+
+
+
+
+
+
+
+
+
+ 待处理
+ 处理中
+ 已办结
+
+
+
+
+
+
+
+