销售订单
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/confirmLender.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/confirmLender.vue
new file mode 100644
index 0000000000..f3f333d956
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/confirmLender.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/printContract.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/printContract.vue
new file mode 100644
index 0000000000..b04529c59c
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/printContract.vue
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdan.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdan.vue
index 7a20fb6f5e..8274a0f5ff 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdan.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdan.vue
@@ -144,7 +144,10 @@
-
+
+
+
+
@@ -158,9 +161,8 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './xiaoshoudingdanAdd.vue'
import divInfo from './xiaoshoudingdanInfo.vue'
-// import divPrint from './dayinxiangshezhi.vue'
-// import xiaodaijinrongfanganInfo from '../../xiaodaijinrongfangan/xiaodaijinrongfanganinfo.vue'
-// import hetongdanganguanliInfo from '@/views/hetongguanli/hetongdanganguanli/hetongdanganguanliInfo.vue'
+import printContract from "@/views/xiaoshouguanli/xiaoshoudingdan/printContract";
+import confirmLender from "@/views/xiaoshouguanli/xiaoshoudingdan/confirmLender";
export default {
name: 'xiaoshoudingdan',
@@ -169,14 +171,13 @@ export default {
pageye,
divAdd,
divInfo,
- // divPrint,
- // xiaodaijinrongfanganInfo,
- // hetongdanganguanliInfo
+ printContract,
+ confirmLender
},
data() {
return {
isableSub: false,
- viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+ viewState: 1, // 1、列表 2、添加 3、修改 4、查看 5、打印合同 6、确认贷款人
xiaodaijinrongfanganInfoShow: false,
hetongdanganguanliAddShow: false,
treedata: [],
@@ -187,12 +188,7 @@ export default {
// 查询 -----------
tableKey: 0,
addOrUpdatetypes: '',
- list: [
- {
- name: '2345',
- contractNum: '2222'
- }
- ],
+ list: [],
sids: [],
nodeState_list: [],
defaultProps: {
@@ -288,10 +284,6 @@ export default {
this.listQuery.params.createDateStart = ''
// // this.getList()
},
- // 返回
- handleReturn() {
- this.$router.go(-1)
- },
// 序号
indexMethod(index) {
@@ -406,6 +398,9 @@ export default {
});
}
})
+ },
+ handleReturn(){
+
},
// 导出
handleDaoChu(row) {
diff --git a/anrui-buscenter/anrui-buscenter-ui/vue.config.js b/anrui-buscenter/anrui-buscenter-ui/vue.config.js
index f50c0dae47..f7f8d302fa 100644
--- a/anrui-buscenter/anrui-buscenter-ui/vue.config.js
+++ b/anrui-buscenter/anrui-buscenter-ui/vue.config.js
@@ -51,6 +51,18 @@ module.exports = {
'^/api': ''
}
},
+ '/mockapi': { // 匹配所有以 '/api'开头的请求路径
+ // target: 'http://39.104.100.138:8111', // 代理目标的基础路径
+ // target: 'http://1mn7264414.qicp.vip', // 代理目标的基础路径
+ // target: 'http://4424790b0u.qicp.vip/',
+ // target: 'http://26077a35f5.wicp.vip/',
+ // target: ' http://120.46.131.15:8111',
+ target: 'http://127.0.0.1:4523/mock/613533', // 代理目标的基础路径
+ changeOrigin: true, // 支持跨域
+ pathRewrite: { // 重写路径: 去掉路径中开头的'/api'
+ '^/mockapi': ''
+ }
+ },
'/upload': { // 匹配所有以 '/api'开头的请求路径
// target: 'http://39.104.100.138:8111', // 代理目标的基础路径
// target: 'http://1mn7264414.qicp.vip', // 代理目标的基础路径
diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclecertificate.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclecertificate.js
index 08ca4998ad..ab07bf9a79 100644
--- a/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclecertificate.js
+++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclecertificate.js
@@ -22,10 +22,9 @@ export function SaveList(data) {
// 修改
export function Update(data) {
- console.log('修改回显接口', data)
return request({
- url: '/base/v1/basevehiclecertificate/fetchBySid/' + data.sid,
- method: 'get',
+ url: '/base/v1/basevehiclecertificate/update/' + data.sid,
+ method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
diff --git a/anrui-scm/anrui-scm-ui/src/components/uploadFile/ManyImageUpload.vue b/anrui-scm/anrui-scm-ui/src/components/uploadFile/ManyImageUpload.vue
index 5e6b485398..db0daf1c60 100644
--- a/anrui-scm/anrui-scm-ui/src/components/uploadFile/ManyImageUpload.vue
+++ b/anrui-scm/anrui-scm-ui/src/components/uploadFile/ManyImageUpload.vue
@@ -125,7 +125,7 @@
}, // 上传方案--成功后执行
uploadImgSuccess_FuJian(response, file, ImageFileList) {
console.log('上传成功!')
- debugger
+ // debugger
this.loadding = false
if (file.response.code === '200') {
// debugger
@@ -134,7 +134,7 @@
var uid = file.response.data
this.files.push({
name: file.response.data.sourceFileName,
- url: file.response.data.filePath,
+ url: file.response.data.fullUrl,
// url: file.response.data.fullUrl,
// fullUrl: file.response.data.fullUrl,
// size: file.response.data.size,
@@ -150,13 +150,14 @@
}
},
removeImage(file, ImageFileList) {
+ console.log('删除照片',file)
this.files.splice(this.files.indexOf(file), 1)
+ console.log('删除照片',this.files)
const imgFiles = []
-
this.files.forEach(o => {
imgFiles.push(o.url)
})
- this.$emit('fileChange', this.files)
+ this.$emit('fileChange', this.files,imgFiles)
},
handlePictureCardPreview(file) {
// this.dialogImageUrl = file.url
diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
index a19486d6a2..8f77971c4f 100644
--- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
+++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
@@ -114,19 +114,19 @@ const codemenu = [
meta: { title: '物料管理' }
}]
},
- // 仓库
+ // 存放地点
{
path: '/scmwarehouse',
component: Layout,
redirect: '/scmwarehouse/index',
meta: {
- title: '仓库'
+ title: '存放地点'
},
children: [{
path: '/scmwarehouse/index',
component: () => import('@/views/anruiscm/scmwarehouse/scmwarehouse.vue'),
name: 'ScmWarehouseIndex',
- meta: { title: '仓库' }
+ meta: { title: '存放地点' }
}]
},
{
@@ -149,21 +149,22 @@ const codemenu = [
meta: { title: '上装管理' }
}]
},
- // 合格证管理
+ // 合格证台账
{
- path: '/hegezheng',
+ path: '/hegezhengtaizhang',
component: Layout,
- redirect: '/hegezheng/hegezhengguanli',
+ redirect: '/hegezheng/hegezhengtaizhang',
meta: {
- title: '合格证管理'
+ title: '合格证台账'
},
children: [{
- path: '/hegezheng/hegezhengguanli',
- component: () => import('@/views/hegezheng/hegezhengguanli/hegezhengguanli.vue'),
- name: 'hegezhengguanli',
- meta: { title: '合格证管理' }
+ path: '/hegezheng/hegezhengtaizhang',
+ component: () => import('@/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue'),
+ name: 'hegezhengtaizhang',
+ meta: { title: '合格证台账' }
}]
},
+
// 采购订单管理
{
path: '/caigoudingdan',
@@ -239,15 +240,7 @@ const codemenu = [
title: '车辆台账'
}
},
- // {
- // path: '/cheliang/hegezhengtaizhang',
- // component: () =>
- // import('@/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue'),
- // name: 'hegezhengtaizhang',
- // meta: {
- // title: '合格证台账'
- // }
- // },
+
// 车辆信息
{
path: '/cheliang/cheliangtaizhangInfo',
diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
index 4a60a9df39..e9b45415da 100644
--- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
@@ -1,7 +1,7 @@
-
+
{{ isSearchShow ? '隐藏查询条件' :
'显示查询条件' }}
@@ -36,7 +36,7 @@
diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue
index 7f10dad94d..f62b042a4b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue
@@ -18,12 +18,12 @@
- 仓库
+ 存放地点
-
+
*使用组织
-
+
-
-
-
+
*分组
-
+
-
+
*编码
-
+
-
-
-
+
*名称
-
+
-
+
*仓库属性
-
+
-
-
-
+
*仓库负责人
-
+
@@ -101,7 +95,6 @@
return {
viewTitle: '',
dialogStatus: 'add',
- refreshItem: 0,
// 级联列表
useOrg_list: [],
dataArr: [],
@@ -203,12 +196,14 @@
},
BuMen0(data) {
data.forEach((e) => {
- if (e.children.length != 0) {
- this.BuMen0(e.children)
- } else {
- delete e.children
- this.dataArr.push(e)
- return
+ if (e.children){
+ if (e.children.length != 0) {
+ this.BuMen0(e.children)
+ } else {
+ delete e.children
+ this.dataArr.push(e)
+ return
+ }
}
})
},
@@ -281,14 +276,14 @@
this.$refs['form_obj'].clearValidate()
})
this.dialogStatus = 'add'
- this.viewTitle = '新增仓库'
+ this.viewTitle = '【新增】存放地点'
},
showEdit(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.dialogStatus = 'edit'
- this.viewTitle = '修改仓库'
+ this.viewTitle = '【修改】存放地点'
const _this = this
req
.fetchBySid(row.sid)
@@ -330,22 +325,6 @@
},
saveEdit() {
const _this = this
- // Start 使用组织字符串赋值
- var useOrg_Sid = ''
- if (this.useOrg_list.length > 0) {
- this.useOrg_list.forEach((item) => {
- var last_id = item[item.length - 1]
- this.select_temp_Sid = '' //临时遍历,用来保存选中结果(组织Sid)
- this.findOrgId(last_id, this.options)
- useOrg_Sid = useOrg_Sid + this.select_temp_Sid + ','
- })
- }
- if (useOrg_Sid !== '') {
- useOrg_Sid = useOrg_Sid.substring(0, useOrg_Sid.length - 1)
- }
- this.formobj.useOrgSid = useOrg_Sid
- console.log('重新赋值后的组织结构', this.formobj.useOrgSid)
- //End
this.$refs['form_obj'].validate(valid => {
if (valid) {
this.submitdisabled = true
@@ -374,7 +353,9 @@
margin-left: -14px;
margin-right: -14px;
}
-
+ .row_first {
+ border-top: 1px solid #e0e3eb !important;
+ }
.wlInfo {
width: 100%;
height: 100%;
diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseInfo.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseInfo.vue
index bfc68146c2..98d05e2323 100644
--- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseInfo.vue
@@ -3,7 +3,7 @@