Browse Source

v2.0 0930

master
DESKTOP-00SUCB6\Administrator 4 years ago
parent
commit
c3eee25f39
  1. 2
      public/config.js
  2. 2
      src/utils/request.js
  3. 2
      src/utils/requestLoading.js
  4. 33
      src/views/get/cancel.vue
  5. 34
      src/views/get/deliverGoods.vue
  6. 7
      src/views/get/get.vue
  7. 2
      src/views/get/getDetail.vue
  8. 10
      src/views/get/returnReceipt.vue
  9. 2
      src/views/send/cancel.vue
  10. 8
      src/views/status/goodsCount.vue
  11. 48
      src/views/status/sendStatus.vue
  12. 4
      src/views/systemManage/user.vue
  13. 9
      src/views/systemManage/whiteList.vue

2
public/config.js

@ -1,7 +1,7 @@
config = {
// API_URL: 'http://fw.niulanshan.com.cn:8081',
API_URL: 'http://121.36.65.171:9999',
API_URL: 'http://121.36.65.171:9998',
// API_URL: 'http://172.119.50.206:8081',
}

2
src/utils/request.js

@ -64,7 +64,7 @@ service.interceptors.response.use(
if (res.code === 209) {
if (isToken) {
isToken = false //防止下个一个token失效的请求在弹出第二个框
MessageBox.alert('你已被登出,请重新登录', '确定登出', {
MessageBox.alert('登录超时,请重新登录', '确定登出', {
confirmButtonText: '重新登录',
type: 'warning',
callback: () => {

2
src/utils/requestLoading.js

@ -107,7 +107,7 @@ service.interceptors.response.use(
if (res.code === 511) {
if (isToken) {
isToken = false //防止下个一个token失效的请求在弹出第二个框
MessageBox.alert('你已被登出,请重新登录', '确定登出', {
MessageBox.alert('登录超时,请重新登录', '确定登出', {
confirmButtonText: '重新登录',
type: 'warning',
callback: () => {

33
src/views/get/cancel.vue

@ -24,7 +24,7 @@
</el-form-item>
</el-form>
</div>
<el-table :data="tableData" style="width: 100%" header-row-class-name="">
<el-table :data="tableData" style="width: 100%" @row-click="clickRowShowDetail">
<el-table-column prop="discardTime" label="日期"></el-table-column>
<el-table-column prop="summary" label="摘要"></el-table-column>
<el-table-column prop="discardId" label="废码单号"></el-table-column>
@ -76,14 +76,17 @@
:headers="upload_headers"
:with-credentials="true"
:on-remove="handleRemove"
:before-upload="beforeAvatarUpload"
:on-success="handleAvatarSuccess"
:before-remove="beforeRemove"
:file-list="fileList"
accept=".txt">
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">导入文件为TXT文本文件且不超过50MB防伪码请按一列进行录入</div>
<div slot="tip" class="el-upload__tip">导入文件为TXT文本文件且不超过1MB防伪码请按一列进行录入</div>
</el-upload>
</el-form-item>
<el-form-item label="摘要:">
<el-input v-model="cancelForm.summary" placeholder="请输入摘要(选填)" clearable maxlength="50"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" size="mini" @click="submitForm('cancelForm')">保存</el-button>
@ -121,7 +124,8 @@ export default {
discard_id:this.$route.query.ids || 'FMD_'+getDay2()+'_'+Math.floor(Math.random()*10000),
discard_time:this.$route.query.times || getDayTime(),
fetch_id:'',
filename:''
filename:'',
summary:""
},
cancelRules: {
fetch_id: [
@ -153,12 +157,13 @@ export default {
}
getDiscardList(params).then(res => {
this.tableData = res.data.list
this.total = res.data.count
this.total = res.data.total
})
},
getQMDList(){
const params = {
pageNo: 1,
status:2,
pageSize: 1000,
}
getFetchList(params).then(res => {
@ -170,6 +175,10 @@ export default {
this.getQMDList()
// this.$router.push({name:'addCancel'})
},
//
clickRowShowDetail(row, column, event){
this.showDetail(row.discardId)
},
//
showDetail(id) {
this.$router.push({name:'getCancelDetail',query:{FMD_id:id}})
@ -183,6 +192,7 @@ export default {
discard_time:this.cancelForm.discard_time,
fetch_id:this.cancelForm.fetch_id.join(','),
filename:this.cancelForm.filename,
summary:this.cancelForm.summary || null,
}
addDiscard(params).then(res => {
this.$message({
@ -201,6 +211,7 @@ export default {
//form
resetForm(formName) {
this.dialogCancelVisible = false
this.fileList = []
this.$refs[formName].resetFields();
},
//
@ -213,6 +224,18 @@ export default {
this.currentPage = val
this.initData()
},
beforeAvatarUpload(file) {
const isTXT = file.type === 'text/plain';
const isLt1M = file.size / 1024 / 1024 < 1;
if (!isTXT) {
this.$message.error('上传文件只能是 TXT 格式!');
}
if (!isLt1M) {
this.$message.error('上传文件大小不能超过 1MB!');
}
return isTXT && isLt1M;
},
handleAvatarSuccess(res, file) {
this.cancelForm.filename = res.data
},

34
src/views/get/deliverGoods.vue

@ -25,7 +25,7 @@
<el-form-item
:prop="'params.' + scope.$index + '.whitelist_id'"
:rules="paramsForm.paramsRules.whitelist_id">
<el-select v-model="scope.row.whitelist_id" placeholder="请选择印刷公司" size="small">
<el-select v-model="scope.row.whitelist_id" placeholder="请选择送货公司" size="small">
<el-option v-for="(item,index) in whiteList" :key="index" :label="item.companyName" :value="item.id"></el-option>
</el-select>
</el-form-item>
@ -188,15 +188,27 @@ export default {
}
if(submitType)
{
savecommit(params).then(res => {
this.$confirm('提交完成后不可删除,请确认信息准确性, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
savecommit(params).then(res => {
this.$message({
message: res.msg,
type: res.code == 200 ? 'success' : 'error'
});
this.$router.go(-1);
}).catch(err => {
console.log(err);
})
}).catch(() => {
this.$message({
message: res.msg,
type: res.code == 200 ? 'success' : 'error'
});
this.$router.go(-1);
}).catch(err => {
console.log(err);
})
type: 'info',
message: '已取消操作'
});
});
} else {
sentReceipt(params).then(res => {
this.$message({
@ -239,10 +251,10 @@ export default {
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isJPG) {
this.$message.error('上传头像图片只能是 JPG/PNG 格式!');
this.$message.error('上传图片只能是 JPG/PNG 格式!');
}
if (!isLt2M) {
this.$message.error('上传头像图片大小不能超过 2MB!');
this.$message.error('上传图片大小不能超过 2MB!');
}
return isJPG && isLt2M;
}

7
src/views/get/get.vue

@ -28,7 +28,7 @@
<span class="font-size-16 line-height-2em color-error" style="margin-right:20px;">印刷量{{AllData.totalPrint}}</span>
<br><br>
</div>
<el-table :data="tableData" style="width: 100%" >
<el-table :data="tableData" style="width: 100%" @cell-click="clickRowShowDetail">
<el-table-column prop="fetchId" label="取码单号"></el-table-column>
<el-table-column prop="fetchTime" label="日期"></el-table-column>
<el-table-column prop="fetchCount" label="取码数"></el-table-column>
@ -376,7 +376,8 @@ export default {
});
},
//
clickRowShowDetail(row, column, event){
clickRowShowDetail(row, column, cell, event){
if(cell.cellIndex == 4 || cell.cellIndex == 5) return
this.showDetail(row.fetchId)
},
//
@ -387,7 +388,7 @@ export default {
addGetDialog(ids = null,times = null){
if( ids == null && times == null && this.isAddBtn == false)
{
this.$alert('当前存在尚未生成取码文件的取码单,请生成取码文件后创建新的取码单!', '提示', {
this.$alert('当前存在尚未生成取码文件的取码单,请生成取码文件后创建新的取码单!', '提示', {
confirmButtonText: '确定',
callback: action => {
}

2
src/views/get/getDetail.vue

@ -103,7 +103,7 @@ export default {
commitReceipt({id:row.id}).then(res => {
this.$message({
type: 'success',
message: '删除成功!'
message: '提交成功!'
});
this.initData()
}).catch(err => {

10
src/views/get/returnReceipt.vue

@ -21,7 +21,7 @@
</el-form-item>
</el-form>
</div>
<el-table :data="tableData" style="width: 100%" header-row-class-name="">
<el-table :data="tableData" style="width: 100%" @cell-click="clickRowShowDetail">
<el-table-column prop="fetchId" label="取码单号"></el-table-column>
<el-table-column prop="fetchTime" label="日期"></el-table-column>
<el-table-column prop="fetchCount" label="取码数"></el-table-column>
@ -78,19 +78,25 @@ export default {
const params = {
pageNo: this.currentPage,
pageSize: this.pageSize,
status:2,
discardId: this.formSearch.number|| null,
startTime:this.formSearch.time?this.formSearch.time[0] : null,
endTime:this.formSearch.time?this.formSearch.time[1] : null
}
getFetchList(params).then(res => {
this.tableData = res.data.list
this.total = res.data.count
this.total = res.data.total
})
},
//
deliverGoods(id,time,count){
this.$router.push({name:'deliverGoods',query:{id:id,time:time,count:count}})
},
//
clickRowShowDetail(row, column, cell, event){
if(cell.cellIndex == 3) return
this.showDetail(row.fetchId)
},
//
showDetail(id) {
this.$router.push({name:'returnReceiptDetail',query:{id:id}})

2
src/views/send/cancel.vue

@ -91,7 +91,7 @@ export default {
}
getDiscardList(params).then(res => {
this.tableData = res.data.list
this.total = res.data.count
this.total = res.data.total
})
},
confirm(id){

8
src/views/status/goodsCount.vue

@ -25,7 +25,7 @@
<span class="font-size-16 line-height-2em color-error" style="margin-right:20px;">未印制量{{AllData.totalUnPrint}}</span>
<br><br>
</div>
<el-table :data="tableData" style="width: 100%" header-row-class-name="">
<el-table :data="tableData" style="width: 100%" @row-click="clickRowShowDetail">
<el-table-column prop="fetchId" label="取码单号"></el-table-column>
<el-table-column prop="fetchTime" label="取码日期"></el-table-column>
<el-table-column prop="fetchCount" label="取码数"></el-table-column>
@ -91,7 +91,7 @@ export default {
}
printList(params).then(res => {
this.tableData = res.data.list
this.total = res.data.count
this.total = res.data.total
})
},
//
@ -100,6 +100,10 @@ export default {
this.AllData = res.data
})
},
//
clickRowShowDetail(row, column, event){
this.showDetail(row.fetchId)
},
//
showDetail(id) {
this.$router.push({name:'getGoodsDetail',query:{id:id}})

48
src/views/status/sendStatus.vue

@ -34,7 +34,7 @@
</el-pagination>
</div>
<div v-show="isShowFetch">
<el-table :data="[fetchData]" style="width: 100%" header-row-class-name="">
<el-table :data="[fetchData]" style="width: 100%" @row-click="clickRowShowDetail">
<!-- <el-table-column prop="fetchId" label="取码单编号"></el-table-column> -->
<el-table-column prop="fetchCount" label="取码数"></el-table-column>
<el-table-column prop="printCount" label="印制数"></el-table-column>
@ -42,7 +42,7 @@
<el-table-column prop="discardCount" label="废码数"></el-table-column>
<el-table-column label="操作" width="200">
<template slot-scope="scope">
<el-button type="text" size="small" @click="showGetDetail(scope.row.fetchId)"><i class="el-icon-edit"></i>查看去向</el-button>
<el-button type="text" size="small" @click="showGetDetail(scope.row.fetchId)">查看去向</el-button>
</template>
</el-table-column>
</el-table>
@ -141,8 +141,10 @@ export default {
}
})
},
//
//
clickRowShowDetail(row, column, event){
this.showGetDetail()
},
//
showGetDetail(id){
this.$router.push({name:'getAllDetail'})
@ -208,7 +210,7 @@ export default {
},
tooltip: {
trigger: 'item',
formatter: '{a} <br/>{b} : {c}',
formatter: '{b} : {c}',
backgroundColor: 'rgba(0,0,0,0.6)',
borderColor: 'rgba(0,0,0,0)',
padding: 10,
@ -271,14 +273,14 @@ export default {
formatter: '{b} : {c}',
position: 'top',
},
emphasis: {
label: {
formatter: '',
show: true,
fontSize: '40',
fontWeight: 'bold',
},
},
// emphasis: {
// label: {
// formatter: '',
// show: true,
// fontSize: '40',
// fontWeight: 'bold',
// },
// },
data: politicsFenBu_data,
},
],
@ -337,7 +339,7 @@ export default {
},
tooltip: {
trigger: 'item',
formatter: '{a} <br/>{b} : {c}',
formatter: '{b} : {c}',
backgroundColor: 'rgba(0,0,0,0.6)',
borderColor: 'rgba(0,0,0,0)',
padding: 10,
@ -389,6 +391,8 @@ export default {
borderWidth: 2, //border
borderColor: 'rgba(0,0,0,0.2)',
},
// minAngle:3,
minShowLabelAngle:0.01,
smooth: true,
center: ['62%', '50%'],
name: '',
@ -400,14 +404,14 @@ export default {
formatter: '{b} : {c}',
position: 'top',
},
emphasis: {
label: {
formatter: '',
show: true,
fontSize: '40',
fontWeight: 'bold',
},
},
// emphasis: {
// label: {
// formatter: '',
// show: true,
// fontSize: '40',
// fontWeight: 'bold',
// },
// },
data: politicsFenBu_data,
},
],

4
src/views/systemManage/user.vue

@ -7,7 +7,7 @@
<el-table-column prop="roleId" label="用户级别"></el-table-column>
<el-table-column prop="operateTime" label="操作时间"></el-table-column>
<el-table-column prop="enIdText" label="操作人"></el-table-column>
<el-table-column prop="operatorName" label="操作人"></el-table-column>
<el-table-column label="操作" width="200">
<template slot-scope="scope">
<el-button type="text" size="small" @click="resetPassDialog(scope.row.id)">重置密码</el-button>
@ -91,7 +91,7 @@ export default {
},
resetPassDialog(id){
// this.dialogResetPass = true
this.$confirm('此操作将重置用户密码, 是否继续?', '提示', {
this.$confirm('此操作将重置用户密码, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

9
src/views/systemManage/whiteList.vue

@ -14,10 +14,13 @@
</el-form>
</div>
<el-table :data="tableData" style="width: 100%" header-row-class-name="">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="companyName" label="企业名称" width="400"></el-table-column>
<el-table-column prop="contactName" label="联系人"></el-table-column>
<el-table-column prop="phone" label="联系电话"></el-table-column>
<el-table-column prop="phone" label="联系电话">
<template slot-scope="scope">
<p v-for="(item,index) in scope.row.phone.split(',')" :key="index">{{item}}</p>
</template>
</el-table-column>
<el-table-column prop="insertTime" label="操作时间"></el-table-column>
<el-table-column prop="enIdText" label="操作人"></el-table-column>
<el-table-column label="操作" width="200">
@ -117,7 +120,7 @@ export default {
],
contact_name:[
{required: true, message: '请输入联系人姓名', trigger: 'blur'},
{min: 2, max: 5, message: '长度在 2 到 5 个字符', trigger: 'blur'}
{min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur'}
],
phone: [
{required: true, validator: checkPhone, trigger: 'blur'}

Loading…
Cancel
Save