Browse Source

代码库迁移新git址代码提交-最新

branch_ccpg_220107
44673626 2 years ago
parent
commit
f8f141f7ca
  1. 24
      vue/src/api/user.js
  2. 0
      vue/src/components/WMSOutOrder/index.vue
  3. 8
      vue/src/layout/components/Navbar.vue
  4. 16
      vue/src/router/index.js
  5. 85
      vue/src/views/profileuser/index.vue
  6. 80
      vue/src/views/profileuser/resetPwd.vue
  7. 79
      vue/src/views/profileuser/userInfo.vue
  8. 17
      vue/src/views/ux/backGroundWork/index.vue
  9. 267
      vue/src/views/ux/billManage/FisUpdateExport/index.vue
  10. 907
      vue/src/views/ux/billManage/kanbanOutOrder copy/detail.vue
  11. 504
      vue/src/views/ux/billManage/kanbanOutOrder copy/index.vue
  12. 2
      vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue
  13. 4
      vue/src/views/ux/vw/dataInput/hq_open/index.vue
  14. 35
      vue/static/config.js

24
vue/src/api/user.js

@ -29,3 +29,27 @@ export function getMenu() {
})
}
// //加载用户登录信息
// export function loadLoginUserInfo() {
// return request({
// url: baseURL + '/api/identity/my-profile',
// method: 'get'
// })
// }
// //修改登录用户基本信息
// export function putLoginUserInfo(data) {
// return request({
// url: baseURL + '/api/identity/my-profile',
// method: 'put',
// data
// })
// }
// //修改登录用户的密码-强密码规则
// export function postLoginUserInfo(data) {
// return request({
// url: baseURL + '/api/identity/my-profile/change-password',
// method: 'post',
// data
// })
// }

0
vue/src/components/WMSOutOrder/index.vue

8
vue/src/layout/components/Navbar.vue

@ -18,7 +18,6 @@
class="nav-item"
@click.native="navItemsClick(item.type)"
>
</router-link>
</flexbox>
</div>
@ -200,9 +199,10 @@ export default {
*进入个人中心
*/
if (type === "person") {
this.$router.push({
name: "person",
});
// this.$router.push({
// name: "person",
// });
this.$router.push({ name: "Profileuser" });
}
},
getCurrentOrg() {

16
vue/src/router/index.js

@ -120,6 +120,22 @@ export const constantRoutes = [
}
]
},
{
path: '/profileuser',
component: Layout,
redirect: '/profileuser/index',
hidden: true,
children: [{
path: 'index',
component: () => import('@/views/profileuser/index'),
name: 'Profileuser',
meta: {
title: '个人中心',
icon: 'user',
noCache: true
}
}]
},
{
path: '/viewCc',
component: Layout,

85
vue/src/views/profileuser/index.vue

@ -0,0 +1,85 @@
<template>
<div class="app-container">
<el-row :gutter="20">
<el-col :span="6" :xs="24">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span style="font-size: 18px;">个人信息</span>
</div>
<div>
<!-- <div class="text-center">
<img src="../../../static/image/common/f778738c-e4f8-4870-b634-56703b4acafe.gif" title="点击上传头像" class="img-circle img-lg" />
</div> -->
<ul class="list-group list-group-striped">
<li class="list-group-item">
<svg-icon icon-class="user" /> 账号
<div class="pull-right">{{ user.userName }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="user" /> 手机号码
<div class="pull-right">{{ user.phoneNumber }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="email" /> 用户邮箱
<div class="pull-right">{{ user.email }}</div>
</li>
<!-- <li class="list-group-item">
<svg-icon icon-class="tree" /> 所属部门
<div class="pull-right" v-if="user.dept"> / </div>
</li>
<li class="list-group-item">
<svg-icon icon-class="peoples" /> 所属角色
<div class="pull-right"></div>
</li> -->
</ul>
</div>
</el-card>
</el-col>
<el-col :span="18" :xs="24">
<el-card>
<div slot="header" class="clearfix">
<span style="font-size: 18px;">基本资料</span>
</div>
<el-tabs v-model="activeTab">
<el-tab-pane label="基本资料" name="userinfo">
<userInfo :user="user" />
</el-tab-pane>
<el-tab-pane label="修改密码" name="resetPwd">
<resetPwd :user="user" />
</el-tab-pane>
</el-tabs>
</el-card>
</el-col>
</el-row>
</div>
</template>
<script>
import userInfo from "./userInfo";
import resetPwd from "./resetPwd";
export default {
name: "Profileuser",
components: { userInfo, resetPwd },
data() {
return {
user: {},
roleGroup: {},
postGroup: {},
activeTab: "userinfo"
};
},
created() {
this.getUser();
},
methods: {
getUser() {
this.$axios.gets("/api/identity/my-profile").then(response => {
this.user = response;
//this.roleGroup = response.roleGroup;
//this.postGroup = response.postGroup;
});
},
}
};
</script>

80
vue/src/views/profileuser/resetPwd.vue

@ -0,0 +1,80 @@
<template>
<el-form ref="form" :model="user" :rules="rules" label-width="80px">
<el-form-item label="旧密码" prop="oldPassword">
<el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" />
</el-form-item>
<el-form-item label="新密码" prop="newPassword">
<el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" />
</el-form-item>
<el-form-item label="确认密码" prop="confirmPassword">
<el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" />
</el-form-item>
<el-form-item>
<el-button type="primary" size="mini" @click="submit">保存</el-button>
<el-button type="danger" size="mini" @click="close">重置</el-button>
</el-form-item>
</el-form>
</template>
<script>
export default {
data() {
const equalToPassword = (rule, value, callback) => {
if (this.user.newPassword !== value) {
callback(new Error("两次输入的密码不一致"));
} else {
callback();
}
};
return {
test: "1test",
user: {
oldPassword: undefined,
newPassword: undefined,
confirmPassword: undefined
},
//
rules: {
oldPassword: [
{ required: true, message: "旧密码不能为空", trigger: "blur" }
],
newPassword: [
{ required: true, message: "新密码不能为空", trigger: "blur" },
{ min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }
],
confirmPassword: [
{ required: true, message: "确认密码不能为空", trigger: "blur" },
{ required: true, validator: equalToPassword, trigger: "blur" }
]
}
};
},
methods: {
submit() {
this.$refs["form"].validate(valid => {
if (valid) {
this.$axios
.posts("/api/identity/my-profile/change-password", {currentPassword:this.user.oldPassword,newPassword:this.user.newPassword})
.then(response => {
this.$notify({
title: "成功",
message: "修改成功",
type: "success",
duration: 2000
});
})
.catch(() => {
//
});
}
});
},
close() {
this.$refs["form"].resetFields();
// this.$store.dispatch("tagsView/delView", this.$route);
// this.$router.push({ path: "/index" });
}
}
};
</script>

79
vue/src/views/profileuser/userInfo.vue

@ -0,0 +1,79 @@
<template>
<el-form ref="form" :model="user" :rules="rules" label-width="80px">
<el-form-item label="用户姓名" prop="name">
<el-input v-model="user.name" />
</el-form-item>
<el-form-item label="手机号码" prop="phoneNumber">
<el-input v-model="user.phoneNumber" maxlength="11" />
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input v-model="user.email" maxlength="50" />
</el-form-item>
<el-form-item>
<el-button type="primary" size="mini" @click="submit">保存</el-button>
<el-button type="danger" size="mini" @click="close">关闭</el-button>
</el-form-item>
</el-form>
</template>
<script>
export default {
props: {
user: {
type: Object
}
},
data() {
return {
//
rules: {
nickName: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
],
email: [
{ required: true, message: "邮箱地址不能为空", trigger: "blur" },
{
type: "email",
message: "'请输入正确的邮箱地址",
trigger: ["blur", "change"]
}
],
phonenumber: [
{ required: true, message: "手机号码不能为空", trigger: "blur" },
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
trigger: "blur"
}
]
}
};
},
methods: {
submit() {
this.$refs["form"].validate(valid => {
if (valid) {
this.$axios
.puts("/api/identity/my-profile", this.user)
.then(response => {
this.$notify({
title: "成功",
message: "修改成功",
type: "success",
duration: 2000
});
})
.catch(() => {
//
});
}
});
},
close() {
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.push({ path: "/dashboard" });
}
}
};
</script>

17
vue/src/views/ux/backGroundWork/index.vue

@ -64,7 +64,7 @@
</el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right"
>说明每间隔30秒进行自动刷新</span
>说明每间隔30秒进行自动刷新, {{ "剩余时间" + times + "秒" }}!</span
>
</flexbox>
</div>
@ -495,6 +495,7 @@ export default {
data() {
return {
crmType: "backJob",
times: 30,
selectValue: "",
selectNameValue: "",
//
@ -565,7 +566,7 @@ export default {
this.timer = setInterval(() => {
this.listQuery.taskId = "";
this.listQuery.stateName = "";
setTimeout(this.getList, 0);
//setTimeout(this.getList, 0);
}, 1000 * 30); //30
// $oncebeforeDestroy
this.$once("hook:beforeDestroy", () => {
@ -573,6 +574,7 @@ export default {
});
},
created() {
this.getTime();
this.getList();
},
beforeDestroy() {
@ -622,6 +624,17 @@ export default {
},
},
methods: {
getTime() {
this.timer = setInterval(() => {
this.times--;
if (this.times === 0) {
clearInterval(this.timer);
this.timer = null;
this.times = 30;
setTimeout(this.getList, 0);
}
}, 1000);
},
//
downloadTemplate() {
let downfilename = "系统导入模板.rar";

267
vue/src/views/ux/billManage/FisUpdateExport/index.vue

@ -48,7 +48,7 @@
</el-tooltip>
<span style="margin-left: 10px; color: #ff5640; float: right"
>说明每间隔15秒进行自动刷新</span
>说明每间隔30秒进行自动刷新, {{ "剩余时间" + times + "秒" }}!</span
>
</flexbox>
</div>
@ -151,17 +151,9 @@
</template>
</el-table-column>
<!-- 操作 -->
<el-table-column label="操作" align="center" width="250">
<!-- <el-table-column label="操作" align="center" width="250">
<template slot-scope="scope">
<div align="center">
<!-- <el-button
v-if="scope.row.actionName == '导出'"
size="mini"
type="text"
@click="handleDownload(scope.row)"
icon="el-icon-edit"
>下载</el-button
> -->
<el-button
v-if="
scope.row.actionName == '导出' &&
@ -188,7 +180,7 @@
>
</div>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
@ -201,6 +193,56 @@
@pagination="getList"
/>
</div>
<!--生成任务单渲染-->
<el-dialog
:visible.sync="dialogFormVisible"
:close-on-click-modal="false"
:title="formTitle"
append-to-body
width="680px"
>
<el-form
ref="formCount"
:inline="true"
:rules="rules"
:model="formCount"
size="mini"
>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="选择版本" required />
</el-col>
<el-col :md="20" :xs="24">
<el-form-item prop="versionValue">
<el-select
v-model="formCount.versionValue"
size="medium"
clearable
style="width: 188px; margin-right: 15px"
placeholder="请选择"
>
<el-option
v-for="item in versionList"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="dialogFormVisible = false"
>取消</el-button
>
<!-- <el-button @click="resetForm('formCount')">重置</el-button> -->
<el-button v-loading="formLoading" type="primary" @click="save"
>确认</el-button
>
</div>
</el-dialog>
</div>
</template>
@ -220,6 +262,7 @@ export default {
data() {
return {
crmType: "backJob",
times: 30,
rules: {
versionValue: [
{ required: true, message: "必须输入!", trigger: "change" },
@ -311,6 +354,7 @@ export default {
kenncode: undefined,
chassisNumber: undefined,
sapCode: undefined,
versionValue: undefined,
// name: "",
// settledate: "",
// materialCode: "",
@ -372,8 +416,8 @@ export default {
this.timer = setInterval(() => {
this.listQuery.taskId = "";
this.listQuery.stateName = "";
setTimeout(this.getList, 0);
}, 1000 * 15); //15
//setTimeout(this.getList, 0);
}, 1000 * 30); //15
// $oncebeforeDestroy
this.$once("hook:beforeDestroy", () => {
clearInterval(timer);
@ -381,6 +425,7 @@ export default {
//this.disabledDateCp5();
},
created() {
this.getTime();
this.getAllVersionList();
this.getMaterialGroup();
this.getList();
@ -431,6 +476,17 @@ export default {
},
},
methods: {
getTime() {
this.timer = setInterval(() => {
this.times--;
if (this.times === 0) {
clearInterval(this.timer);
this.timer = null;
this.times = 30;
setTimeout(this.getList, 0);
}
}, 1000);
},
dblhandleCurrentChange(row, column, cell, event) {
if (column.label === "说明") {
row.isEditCell = true;
@ -602,20 +658,44 @@ export default {
},
getAllVersionList() {
this.$axios
.posts("/api/settleaccount/CentralizedControl/openlist")
.then((response) => {
this.versionList = [];
response.forEach((element) => {
let options = {};
options.value = element.version;
options.label = element.version;
this.versionList.push(options);
});
})
.catch(() => {
this.listLoading = false;
});
this.versionList = [];
let yy_now = new Date().getFullYear();
let mm_now = new Date().getMonth() + 1;
let mm_last = new Date().getMonth();
if (mm_last.toString().length == 1) {
mm_last = "0" + mm_last.toString();
}
let options_last = {};
var date_last = yy_now.toString() + mm_last.toString();
options_last.value = date_last;
options_last.label = date_last;
this.versionList.push(options_last);
if (mm_now.toString().length == 1) {
mm_now = "0" + mm_now.toString();
}
let options_now = {};
var date_now = yy_now.toString() + mm_now.toString();
options_now.value = date_now;
options_now.label = date_now;
this.versionList.push(options_now);
// this.$axios
// .posts("/api/settleaccount/CentralizedControl/openlist")
// .then((response) => {
// this.versionList = [];
// response.forEach((element) => {
// let options = {};
// options.value = element.version;
// options.label = element.version;
// this.versionList.push(options);
// });
// })
// .catch(() => {
// this.listLoading = false;
// });
},
//
getMaterialGroup() {
@ -646,101 +726,62 @@ export default {
this.startTime = "";
this.endTime = "";
},
handleCreate() {
this.$nextTick(() => {
this.$refs["formCount"].resetFields();
});
this.formTitle = "更新FIS数据";
this.form = {};
this.dialogFormVisible = true;
},
save() {
this.$refs.formCount.validate((valid) => {
if (valid) {
this.formLoading = true;
this.listExportQuery.version = this.formCount.versionValue; //
if (this.formCount.materialCode != "") {
this.listExportQuery.materialCode = this.formCount.materialCode; //
}
if (this.formCount.sapMaterialCode != "") {
this.listExportQuery.sapCode = this.formCount.sapMaterialCode; //
}
if (this.formCount.kennCode != "") {
this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN
}
this.listExportQuery.begin = this.startTime
? this.startTime
: undefined;
this.listExportQuery.end = this.endTime ? this.endTime : undefined;
if (this.formCount.chassisNumber != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //
}
if (this.formCount.materialGroupValue != "") {
this.listExportQuery.materialGroup = this.getmaterialGroupValue; //
}
console.log(
"FIS更新-导出条件:" + JSON.stringify(this.listExportQuery)
);
this.$axios
.posts(
"/api/settleaccount/ReportMakeService/FisUpdateExportService",
this.listExportQuery
)
.then((res) => {
let taskid = res;
if (Number.isInteger(taskid)) {
this.$notify({
title: "成功",
message: "任务生成成功!任务号:" + taskid,
type: "success",
duration: 2000,
this.$confirm("是否生成FIS更新任务?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.formLoading = true;
this.listExportQuery.version = this.formCount.versionValue; //
console.log(
"FIS更新-生成条件:" + JSON.stringify(this.listExportQuery)
);
this.$axios
.posts(
"/api/settleaccount/ReportMakeService/FisUpdateExportService",
this.listExportQuery
)
.then((res) => {
let taskid = res;
if (Number.isInteger(taskid)) {
this.$notify({
title: "成功",
message: "任务生成成功!任务号:" + taskid,
type: "success",
duration: 2000,
});
}
this.getList();
this.formLoading = false;
this.dialogFormVisible = false;
})
.catch(() => {
this.formLoading = false;
this.dialogFormVisible = false;
});
}
this.getList();
this.formLoading = false;
this.dialogFormVisible = false;
})
.catch(() => {
this.formLoading = false;
this.dialogFormVisible = false;
this.$message({
type: "info",
message: "已取消操作",
});
});
}
});
},
handleCreate() {
this.$confirm("是否生成FIS更新任务?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.formLoading = true;
console.log("FIS更新-生成条件:" + JSON.stringify(this.listExportQuery));
this.$axios
.posts(
"/api/settleaccount/ReportMakeService/FisUpdateExportService",
this.listExportQuery
)
.then((res) => {
let taskid = res;
if (Number.isInteger(taskid)) {
this.$notify({
title: "成功",
message: "任务生成成功!任务号:" + taskid,
type: "success",
duration: 2000,
});
}
this.getList();
this.formLoading = false;
this.dialogFormVisible = false;
})
.catch(() => {
this.formLoading = false;
this.dialogFormVisible = false;
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
filterHandler(value, row, column) {
const property = column["property"];
@ -856,7 +897,7 @@ export default {
//
this.listQuery.name = "Fis发货数据更新状态";
//this.listQuery.type = this.JobversionValue;
console.log("FIS更新传入条件:"+this.listQuery)
//console.log("FIS" + this.listQuery);
this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => {

907
vue/src/views/ux/billManage/kanbanOutOrder copy/detail.vue

@ -0,0 +1,907 @@
<!--大众看板出库单-->
<template>
<div class="cr-body-content">
<flexbox class="content-header">
<JobSelectVerson
:options="JobVersionList"
style="width: 150px; margin-left: -10px"
class="search-container"
@value-change="JobVersionValue"
></JobSelectVerson>
<el-button
v-if="
this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3
"
class="filter-item"
type="success"
icon="el-icon-check"
size="mini"
@click="handleCreateBills()"
>确认出库单</el-button
>
<el-button
v-else
disabled
class="filter-item"
type="success"
icon="el-icon-check"
size="mini"
>确认出库单</el-button
>
<el-button
v-if="
this.selectJobVersionValue == 2 || this.selectJobVersionValue == 3
"
class="filter-item"
size="mini"
type="warning"
icon="el-icon-download"
@click="HandleOutPutCancel()"
>取消出库(支持批量)
</el-button>
<el-button
v-else
disabled
class="filter-item"
size="mini"
type="warning"
icon="el-icon-download"
>取消出库(支持批量)
</el-button>
<el-button
v-if="this.selectJobVersionValue == 0"
class="filter-item"
size="mini"
type="danger"
icon="el-icon-download"
@click="handleDelete()"
>出库单删除
</el-button>
<el-button
v-else
disabled
class="filter-item"
size="mini"
type="danger"
icon="el-icon-download"
>出库单删除
</el-button>
<el-input
v-model="searchContent"
clearable
size="small"
placeholder="按照零件号搜索..."
style="width: 230px"
class="search-container"
@keyup.enter.native="handleFilter"
/>
<el-button
size="mini"
type="success"
icon="el-icon-search"
@click="handleFilter"
>搜索
</el-button>
<el-button
class="filter-item"
size="mini"
type="info"
icon="el-icon-download"
@click="handleDownload()"
>全部导出
</el-button>
<!--表格头组件filter查询-->
<c-r-m-table-head
ref="crmTableHead"
:crm-type="crmType"
@handle="handleHandle"
@filter="handleFilters"
>
</c-r-m-table-head>
</flexbox>
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading.fullscreen.lock="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<el-table-column type="selection" width="44px"></el-table-column>
<el-table-column
v-for="(item, index) in getDefaultField"
:key="index"
:prop="item.prop"
:label="item.label"
:min-width="item.width"
:formatter="fieldFormatter"
sortable="custom"
show-overflow-tooltip
:gutter="0"
>
<template slot="header" slot-scope="scope">
{{ scope.column.label }}
</template>
</el-table-column>
</el-table>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
<pagination
v-show="totalCount > 0"
:total="totalCount"
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
</div>
<div>
<el-dialog
:append-to-body="true"
:visible.sync="dialogFormVisible"
:title="formTitle"
width="700px"
>
<el-form
ref="accountDatelist"
:inline="true"
:model="accountDatelist"
:rules="rules"
size="small"
label-width="120px"
>
<el-form-item label="日期" prop="accountDate">
<el-date-picker
v-model="accountDatelist.accountDate"
type="date"
:picker-options="pickerOptions"
clearable
placeholder="选择日期"
>
</el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="dialogFormVisible = false"
>取消</el-button
>
<el-button v-loading="formLoading" type="primary" @click="save()"
>确认</el-button
>
</div>
</el-dialog>
</div>
</div>
</template>
<script>
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import { downloadFile } from "@/utils/crmindex.js";
import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
import moment from "moment";
import _ from "lodash";
export default {
name: "sendUnsettledDiffReport",
components: { Pagination, CRMTableHead, CRMTableHead, JobSelectVerson },
directives: { permission },
props: {
customerInfos: {
type: Array,
default: () => {
return [];
},
},
},
data() {
return {
crmType: "kanbanOutOrder",
pickerOptions: {
//
disabledDate(time) {
let date = new Date();
let currentdate = moment(date).format("YYYY-MM");
var timedate = moment(time).format("YYYY-MM");
return currentdate < timedate;
},
},
rules: {
//
erpMaterialCode: [
{ required: true, message: "必须输入!", trigger: "blur" },
],
accountDate: [
{ required: true, message: "日期必须输入!", trigger: "blur" },
],
},
searchContent: "", //
customerInfo: {
parentId: "",
version: "",
},
form: {
dicDetailID: "",
customerId: "",
projectId: "",
},
list: null,
totalCount: 0,
listLoading: true,
formLoading: false,
JobVersionList: [
{ value: "0", label: "未处理" },
{ value: "1", label: "申请出库" },
{ value: "2", label: "确认出库" },
{ value: "3", label: "不能出库" },
{ value: "4", label: "取消出库" },
],
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
listQuery: {
Filters: [
{
logic: 0,
column: "state",
action: 0,
value: "0",
}, //
],
SkipCount: 0,
MaxResultCount: 15,
billNum: "",
},
listOutPutQuery: {
accountDate: "",
version: "",
guids: "",
billNum: "",
},
listDeleteQuery: {
billNum: "",
},
accountDatelist: {
accountDate: "",
},
page: 1,
JobversionValue: "",
JobversionValueVerson: "",
selectJobVersionValue: 0,
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 230,
isEdit: false,
};
},
mounted() {
var self = this;
window.onresize = function () {
var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 190;
};
},
created() {
//this.getList();
},
watch: {
customerInfos: {
handler(newVal) {
if (newVal == "" || newVal == "undefined") {
//TODO
} else {
newVal.forEach((element) => {
this.customerInfo.parentId = element.ParentId;
this.customerInfo.version = element.Version;
});
if (this.customerInfo.parentId != "") {
this.JobVersionList = [
{ value: "0", label: "未处理" },
{ value: "1", label: "申请出库" },
{ value: "2", label: "确认出库" },
{ value: "3", label: "不能出库" },
{ value: "4", label: "取消出库" },
];
this.selectJobVersionValue = 0;
//
this.listQuery.Filters = [];
var column = "state";
let filter = {
logic: 0,
column: column,
action: 0,
value: "0",
};
this.listQuery.Filters.push(filter);
this.getList();
}
}
},
immediate: true,
},
},
computed: {
/** 列表字段 */
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({
label: "版本",
prop: "version",
width: 110,
});
tempsTabs.push({
label: "零件号",
prop: "materialCode",
width: 150,
});
tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 });
tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 });
tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 150 });
tempsTabs.push({ label: "看板号", prop: "kanban", width: 150 });
tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "开票单价", prop: "price", width: 100 });
tempsTabs.push({ label: "开票金额", prop: "amt", width: 100 });
tempsTabs.push({ label: "单据", prop: "billNum", width: 100 });
tempsTabs.push({ label: "状态", prop: "state", width: 100 });
return tempsTabs;
},
},
methods: {
//
handleDownload(command) {
this.listLoading = true;
this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
console.log(
"大众备件出库单导出:" + JSON.stringify(this.listOutPutQuery)
);
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/Export",
this.listOutPutQuery
)
.then((res) => {
let fileNameOfProject = res;
this.$axios
.BolbGets(
"/api/settleaccount/getblobfile/download/" + fileNameOfProject
)
.then((response) => {
if (fileNameOfProject.indexOf("_") != -1) {
let downName =
fileNameOfProject.slice(
0,
fileNameOfProject.lastIndexOf("_")
) +
fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
downloadFile(response, downName);
this.$notify({
title: "成功",
message: "数据-导出成功!",
type: "success",
duration: 2000,
});
} else {
downloadFile(response, fileNameOfProject);
this.$notify({
title: "成功",
message: "数据-导出成功!",
type: "success",
duration: 2000,
});
}
this.listLoading = false;
});
});
},
//
JobVersionValue(params) {
this.selectJobVersionValue = params.value;
//alert(this.selectJobVersionValue);
this.searchContent = "";
this.listQuery.Filters = [];
let filter = {
Column: "state",
Value: params.value,
Logic: 0,
Action: 0,
};
this.listQuery.Filters.push(filter);
this.getList();
},
save(row) {
this.formLoading = true;
if (this.formTitle == "撤销出库") {
this.CancelBills(row);
} else if (this.formTitle == "创建出库单") {
this.saveBills(row);
}
},
//
handleCreateBills() {
this.dialogFormVisible = true;
if (this.$refs["accountDatelist"] !== undefined) {
this.$refs["accountDatelist"].resetFields();
}
this.formTitle = "创建出库单";
},
//
HandleOutPutCancel() {
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
let myalert = "选中项"; //使
this.$confirm("是否确认取消出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.dialogFormVisible = true;
if (this.$refs["accountDatelist"] !== undefined) {
this.$refs["accountDatelist"].resetFields();
}
this.formTitle = "撤销出库";
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
//
saveBills: _.debounce(
function (row) {
this.listOutPutQuery.guids = [];
this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
if (this.accountDatelist.accountDate == "") {
this.$message({
message: "请选择日期!",
type: "warning",
});
return;
}
this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
console.log("确认出库条件:" + JSON.stringify(this.listOutPutQuery));
let myalert = "";
var getAccountMonth = moment(this.accountDatelist.accountDate).format(
"YYYY-MM"
);
let date = new Date();
let currentMonth = moment(date).format("YYYY-MM");
if (getAccountMonth < currentMonth) {
myalert = "过账日期小于当前月份";
this.$confirm("是否确认" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Pass",
this.listOutPutQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.accountDatelist.accountDate = "";
this.dialogFormVisible = false;
this.getList();
this.formLoading = false;
})
.catch(() => {
this.formLoading = false;
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
this.formLoading = false;
});
} else if (getAccountMonth === currentMonth) {
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Pass",
this.listOutPutQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.accountDatelist.accountDate = "";
this.dialogFormVisible = false;
this.getList();
this.formLoading = false;
})
.catch(() => {
this.formLoading = false;
});
} else {
this.$message({
type: "warning",
message: "选择的过账日期不能大于当前月份!",
});
this.formLoading = false;
return;
}
},
1000,
{
leading: true, //
trailing: false, //,
}
),
//
CancelBills: _.debounce(
function (row) {
if (this.accountDatelist.accountDate == "") {
this.$message({
message: "请选择日期!",
type: "warning",
});
return;
}
var params = [];
if (row) {
//
params.push(row.id);
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
}
this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.guids = params;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
console.log("取消出库条件:" + JSON.stringify(this.listOutPutQuery));
let myalert = "";
var getAccountMonth = moment(this.accountDatelist.accountDate).format(
"YYYY-MM"
); //
let date = new Date();
let currentMonth = moment(date).format("YYYY-MM"); //
console.log(
"过账日期:" +
JSON.stringify(getAccountMonth) +
"当前日期:" +
JSON.stringify(currentMonth)
);
if (getAccountMonth < currentMonth) {
myalert = "过账日期小于当前月份";
this.$confirm("是否确认" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Cancel",
this.listOutPutQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "操作成功",
type: "success",
duration: 2000,
});
this.accountDatelist.accountDate = "";
this.dialogFormVisible = false;
this.getList();
this.formLoading = false;
})
.catch(() => {
this.formLoading = false;
this.$message({
type: "info",
message: "调用服务出错!",
});
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
this.formLoading = false;
});
} else if (getAccountMonth === currentMonth) {
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Cancel",
this.listOutPutQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "操作成功",
type: "success",
duration: 2000,
});
this.accountDatelist.accountDate = "";
this.dialogFormVisible = false;
this.getList();
this.formLoading = false;
})
.catch(() => {
this.formLoading = false;
this.$message({
type: "info",
message: "调用服务出错!",
});
});
} else {
this.$message({
type: "warning",
message: "选择的过账日期不能大于当前月份!",
});
this.formLoading = false;
return;
}
},
1000,
{
leading: true, //
trailing: false, //,
}
),
//
handleDelete(row) {
var getdata = JSON.stringify(this.list);
if (getdata == "[]") {
this.$message({
type: "info",
message: "当前列表为空,不能执行删除操作!",
});
return;
}
this.listDeleteQuery.billNum = this.listQuery.billNum;
console.log("单据号:" + JSON.stringify(this.listDeleteQuery));
this.$confirm("是否确认整单删除?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/WmsOutPutDelete",
this.listDeleteQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
//this.getList();
this.$emit("Change", "删除成功");
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
}
},
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property == "state") {
return {
0: "未处理",
1: "申请出库",
2: "确认出库",
3: "不能出库",
4: "取消出库",
}[row[column.property]];
}
return row[column.property] || "--";
},
importExcelData() {
//
this.showExcelImport = false;
this.getList();
},
getList(data) {
this.listLoading = true;
if (data != undefined) {
this.listQuery.SkipCount = (this.page - 1) * data.limit;
} else {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
this.listQuery.billNum = this.customerInfo.parentId;
console.log("详表查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/WmsKanbanDetailList",
this.listQuery
)
.then((response) => {
this.list = response.items;
//alert(JSON.stringify(response.Items))
this.totalCount = response.totalCount;
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
/** 筛选操作 */
handleFilter(data) {
this.page = 1;
this.listQuery.Filters = [];
if (data === null) {
this.getList(); //
} else {
if (this.searchContent != "") {
var column = "materialCode";
let filter = {
logic: 0,
column: column,
action: 6,
value: this.searchContent,
};
this.listQuery.Filters.push(filter);
}
this.getList();
}
},
/** 多项筛选操作 */
/** 筛选操作 */
handleFilters(data) {
if (data === null) {
this.listQuery.Filters = [];
this.getList(); //
} else {
this.filterObj = data;
console.log("筛选" + JSON.stringify(data));
var offsetHei = document.documentElement.clientHeight;
var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
this.tableHeight = offsetHei - removeHeight;
this.currentPage = 1;
let Filter = [];
data.forEach((item) => {
let filter = {};
if (item.formType === "datetime" || item.formType === "datetime") {
// (datetime >= a and datetime <=b)
filter["Column"] = item.fieldName;
filter["Logic"] = 0;
filter["Value"] = item.value[0];
filter["Action"] = item.action;
Filter.push(filter);
if (item.value[1] != null) {
filter["Value"] = item.value[1];
filter["Action"] = 5;
Filter.push(filter);
}
} else {
filter["Column"] = item.fieldName;
filter["Value"] = item.value;
filter["Logic"] = 0;
filter["Action"] = item.action;
Filter.push(filter);
}
});
console.log("筛选条件" + JSON.stringify(Filter));
this.listQuery.Filters = Filter;
this.getList();
}
},
resetQuery() {},
sortChange(data) {
const { prop, order } = data;
if (!prop || !order) {
this.handleFilter();
return;
}
this.listQuery.Sorting = prop + " " + order;
this.handleFilter();
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
/** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) {
if (
column.property === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
) {
return { textAlign: "right" };
} else {
return { textAlign: "left" };
}
},
/** 通过回调控制表头style */
headerRowStyle({ row, column, rowIndex, columnIndex }) {
if (
column.property === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
) {
return { textAlign: "right", background: "#FAFAFA" };
} else {
return { textAlign: "left", background: "#FAFAFA" };
}
},
handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
},
};
</script>
<style lang="scss" scoped>
@import "../../styles/crmtable.scss";
</style>

504
vue/src/views/ux/billManage/kanbanOutOrder copy/index.vue

@ -0,0 +1,504 @@
<!--轿车看板-发出未结算-->
<template>
<div class="cr-body-content">
<flexbox class="content-header">
<el-input
v-model="searchContent"
clearable
size="small"
placeholder="按照单据号搜索..."
style="width: 200px"
class="search-container"
@keyup.enter.native="handleFilter"
/>
<el-input
v-model="searchVersion"
clearable
size="small"
placeholder="按照版本号搜索..."
style="width: 200px"
class="search-container"
@keyup.enter.native="handleFilter"
/>
<el-button
size="mini"
type="success"
icon="el-icon-search"
@click="handleFilter"
>搜索
</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery()"
>重置</el-button
>
<el-button
class="filter-item"
size="mini"
type="warning"
icon="el-icon-upload2"
@click="handleImportExcel()"
>导入文件Excel
</el-button>
</flexbox>
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
@cell-dblclick="dblhandleCurrentChange"
>
<el-table-column
label="单据号"
prop="billNum"
sortable="custom"
align="center"
width="250px"
>
<template slot-scope="scope">
<el-tooltip :content="scope.row.billNum" placement="bottom-end">
<span class="link-type" @click="handleDrawerOpen(scope.row)">{{
scope.row.billNum
}}</span>
</el-tooltip>
</template>
</el-table-column>
<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<el-table-column
v-for="(item, index) in getDefaultField"
:key="index"
:prop="item.prop"
:label="item.label"
:min-width="item.width"
:formatter="fieldFormatter"
sortable="custom"
show-overflow-tooltip
:gutter="0"
>
<template slot="header" slot-scope="scope">
{{ scope.column.label }}
</template>
</el-table-column>
<el-table-column label="备注" width="400" align="center">
<template slot-scope="scope">
<el-input
ref="inputRef"
v-if="scope.row.isEditCell"
v-model="scope.row.remark"
class="el-input"
v-focus
@blur="cellBlur(scope.row, scope.column)"
/>
<span v-else>{{ scope.row.remark }}</span>
<el-button
style="margin-left: 5px"
v-if="scope.row.isEditCell"
type="success"
icon="el-icon-check"
size="small"
circle
@click="submitName(scope.row)"
></el-button>
<el-button
v-show="scope.row.isEditCell"
class="cancel-btn"
size="mini"
icon="el-icon-refresh"
type="warning"
@click.native.prevent="handleCancel(scope.row)"
>
cancel
</el-button>
</template>
</el-table-column>
</el-table>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
<pagination
v-show="totalCount > 0"
:total="totalCount"
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
<!-- 导入Excel组件 -->
<importExcel
ref="importexcel"
:show="showExcelImport"
:crmType="crmType"
@close="importExcelData"
/>
<!-- 抽屉控件 -->
<el-drawer
title="信息详细页"
size="75%"
direction="rtl"
:visible.sync="drawer"
:before-close="handleDrawerClose"
ref="detailDrawer"
>
<div>
<Detail
v-bind:customerInfos="customerInfos"
@Change="drawerclose"
style="margin-top: -35px"
></Detail>
</div>
</el-drawer>
</div>
</div>
</template>
<script>
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import permission from "@/directive/permission/index.js";
import Detail from "./detail";
import moment from "moment";
import importExcel from "@/components/ImportExcel-base";
import { formatTimeToTimestamp } from "@/utils/index";
export default {
name: "sendUnsettledDiffReport",
components: { Pagination, Detail, importExcel },
directives: { permission },
data() {
return {
crmType: "kanbanoutorder",
rules: {
// version: [{ required: true, message: "", trigger: "change" }],
// beginTime: [{ required: true, message: "", trigger: "change" }],
// endTime: [{ required: true, message: "", trigger: "change" }],
},
customerInfos: [],
searchContent: "", //
searchVersion: "", //
drawer: false,
form: {
version: "",
customerCode: "",
customerName: "",
beginTime: "",
endTime: "",
},
versionValue: "",
versionList: [],
startTimeVale: "",
endTimeVale: "",
list: null,
totalCount: 0,
listLoading: true,
formLoading: false,
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
listQuery: {
Filters: [
{
logic: 0,
column: "Enabled",
action: 0,
value: "true",
}, //
],
//OrgID:"",
SkipCount: 0,
MaxResultCount: 15,
},
page: 1,
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 200,
isEdit: false,
};
},
mounted() {
var self = this;
window.onresize = function () {
var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 200;
};
},
created() {
this.getList();
//this.getVersionInfo();
},
computed: {
/** 列表字段 */
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "状态", prop: "sumContent", width: 160 });
tempsTabs.push({
label: "版本",
prop: "version",
width: 120,
});
//tempsTabs.push({ label: "", prop: "billNum", width: 150 });
tempsTabs.push({ label: "创建人", prop: "creator", width: 160 });
tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
//tempsTabs.push({ label: "", prop: "remark", width: 120 });
return tempsTabs;
},
},
methods: {
drawerclose(param) {
if (param == "删除成功") {
this.$refs.detailDrawer.closeDrawer();
this.getList();
}
},
dblhandleCurrentChange(row, column, cell, event) {
if (column.label === "备注") {
row.isEditCell = true;
this.$set(row, "isEditCell", true);
this.$nextTick(() => {
this.$refs["inputRef"].focus();
});
}
this.list = this.list.filter((item) => {
return item;
});
},
//
cellBlur(row, column) {
row.isEditCell = false;
this.$set(row, "isEditCell", false);
},
// 线
submitName(row) {
let getguid = row.id;
let getremark = row.remark;
this.$axios
.gets("/api/settleaccount/wmskanbanoutput/UpdateRemark", {
id: getguid,
remark: getremark,
})
.then((response) => {
if (response == true) {
this.$notify({
title: "成功",
message: "更新成功",
type: "success",
duration: 2000,
});
this.getList();
}
})
.catch(() => {
this.listLoading = false;
});
},
//
handleCancel(row) {
row.isEditCell = false;
//row.stockQty = row.originalstockQty;
this.$set(row, "isEditCell", false);
// this.$message({
// message: "",
// type: "warning",
// });
this.getList();
},
handleImportExcel() {
//
this.showExcelImport = true;
this.$refs.importexcel.handleImportExcelClick();
},
getVersionInfo() {
//
this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 1000;
this.$axios
.posts("/api/settleaccount/CentralizedControl/openlist")
.then((response) => {
this.versionList = [];
response.forEach((element) => {
let options = {};
options.value = element.version;
options.label = element.version;
this.versionList.push(options);
});
})
.catch(() => {
this.listLoading = false;
});
},
//
handleDrawerOpen(param) {
this.drawer = true;
var parentId = param.billNum; //
var version = param.version; //
this.customerInfos = [
{
ParentId: parentId,
Version: version,
},
];
},
handleDrawerClose(done) {
done();
},
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property == "creationTime") {
var date = row[column.property];
if (date == undefined) {
return "";
}
return moment(date).format("YYYY-MM-DD HH:mm:ss");
}
if (column.property == "state") {
return { 0: "已提交", 1: "已出库", 2: "不能出库" }[
row[column.property]
];
}
return row[column.property] || "--";
},
importExcelData() {
//
this.showExcelImport = false;
this.getList();
},
getList(data) {
this.listLoading = true;
if (data != undefined) {
this.listQuery.SkipCount = (this.page - 1) * data.limit;
} else {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
console.log("主表查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/WmsKanbanList",
this.listQuery
)
.then((response) => {
this.list = response.items;
//alert(JSON.stringify(response.Items))
this.totalCount = response.totalCount;
//
this.list.forEach((element) => {
element["isEditCell"] = false;
});
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
/** 筛选操作 */
// handleFilter() {
// this.page = 1;
// this.getList();
// this.listQuery.Filters = [];
// if (this.searchContent != "") {
// var column = "billNum";
// let filter = {
// logic: 0,
// column: column,
// action: 6,
// value: this.searchContent,
// };
// this.listQuery.Filters.push(filter);
// }
// this.getList();
// },
//resetQuery() {},
/** 筛选操作 */
handleFilter() {
this.page = 1;
this.getList();
let Filter = [];
if (this.searchContent != "") {
var column = "billNum";
let filter = {
logic: 0,
column: column,
action: 6,
value: this.searchContent,
};
Filter.push(filter);
}
if (this.searchVersion != "") {
var column = "version";
let filter = {
logic: 0,
column: column,
action: 6,
value: this.searchVersion,
};
Filter.push(filter);
}
console.log("筛选条件" + JSON.stringify(Filter));
this.listQuery.Filters = Filter;
this.getList();
},
resetQuery() {
this.searchContent = "";
this.searchVersion = "";
this.listQuery.Filters = [];
this.listQuery.SkipCount = 1;
this.getList();
},
sortChange(data) {
const { prop, order } = data;
if (!prop || !order) {
this.handleFilter();
return;
}
this.listQuery.Sorting = prop + " " + order;
this.handleFilter();
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
/** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) {
if (column.property === "sumContent") {
return { textAlign: "left", "font-weight": 700, color: "#FF6100" };
} else {
return { textAlign: "left" };
}
},
/** 通过回调控制表头style */
headerRowStyle({ row, column, rowIndex, columnIndex }) {
// if (column.property === "sumContent") {
// return { textAlign: "left", background: "#a85d7e" };
// }
},
handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
},
};
</script>
<style lang="scss" scoped>
@import "../../styles/crmtable.scss";
</style>

2
vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue

@ -516,7 +516,7 @@ export default {
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
.bn(() => {
this.$axios
.posts(
"/api/settleaccount/WMSCusomerKanbanoutput/WmsCustomerKanbanOutPut-Pass",

4
vue/src/views/ux/vw/dataInput/hq_open/index.vue

@ -294,8 +294,8 @@ export default {
width: 170,
});
tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
// tempsTabs.push({ label: "", prop: "price", width: 100 });
// tempsTabs.push({ label: "", prop: "amt", width: 100 });
tempsTabs.push({ label: "单价", prop: "price", width: 100 });
tempsTabs.push({ label: "金额", prop: "amt", width: 100 });
tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 });
tempsTabs.push({
label: "存储地点",

35
vue/static/config.js

@ -37,8 +37,8 @@ if (process.env.NODE_ENV === 'development') {
configJSON = {
base: {
//ip: 'http://192.168.0.67',
ip: 'http://192.168.0.140',
ip: 'http://192.168.0.67',
//ip: 'http://192.168.0.140',
//ip: 'http://149.223.116.5',
//ip: 'http://124.220.28.250',
//ip: 'http://10.123.148.162',
@ -71,36 +71,5 @@ if (process.env.NODE_ENV === 'development') {
}
}
}
// 开发环境
// export default {
// base: {
// ip: 'http://localhost',
// auth_port: '44323',
// public_port: '44350',
// backend_port: '44350'
// },
// basic: {},
// upload: {
// ip: 'http://localhost'
// },
// authServer: {
// ip: 'http://localhost'
// },
// crm: {
// ip: 'http://localhost'
// },
// oms: {
// ip: 'http://localhost'
// },
// wx: {
// ip: 'http://localhost',
// basicPort: ''
// },
// client: {
// client_id: 'abpvnext_master_App',
// client_secret: '1q2w3e*',
// grant_type: 'password'
// }
// }
export default configJSON

Loading…
Cancel
Save