Browse Source

Merge branch 'branch_ccpg_220107' of http://dev.ccwin-in.com:6090/Win.Sfs.SmartSettlementSystem.PG into branch_ccpg_220107

branch_ccpg_220107
佐 张 3 years ago
parent
commit
25c2624653
  1. 146
      vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
  2. 147
      vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
  3. 146
      vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
  4. 1
      vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue
  5. 3
      vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue
  6. 1
      vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
  7. 1
      vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
  8. 1
      vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue
  9. 1
      vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue
  10. 1
      vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue

146
vue/src/views/ux/billManage/kanbanOutOrder/detail.vue

@ -21,7 +21,7 @@
type="success"
icon="el-icon-check"
size="mini"
@click="handleCreateBills()"
@click="print()"
>确认出库单(支持批量)</el-button
>
<el-button
@ -104,6 +104,45 @@
@pagination="getList"
/>
</div>
<div>
<el-dialog
:append-to-body="true"
:visible.sync="dialogFormVisible"
:title="formTitle"
width="700px"
>
<el-form
ref="form"
:inline="true"
:model="form"
:rules="rules"
size="small"
label-width="120px"
>
<el-form-item label="日期" prop="accountDate">
<el-date-picker
v-model="accountDatelist.accountDate"
type="date"
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="handleCreateBills()"
>确认</el-button
>
</div>
</el-dialog>
</div>
</div>
</template>
@ -177,10 +216,14 @@ export default {
billNum: "",
},
listOutPutQuery: {
accountDate:"",
version: "",
guids: "",
billNum: "",
},
accountDatelist:{
accountDate:""
},
page: 1,
JobversionValue: "",
JobversionValueVerson: "",
@ -315,99 +358,44 @@ export default {
});
});
},
print() {
this.dialogFormVisible = true;
},
//
handleCreateBills(row) {
if (this.multipleSelection.length == 0) {
this.dialogFormVisible = true;
this.listLoading = true;
this.listOutPutQuery.guids = [];
this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
if (this.accountDatelist != "") {
this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
}
//this.listOutPutQuery.accountDate = this.accountDatelist;
console.log(
"未选择时全部确认出库条件:" + JSON.stringify(this.listOutPutQuery)
);
this.$confirm("是否全部确认出库?", "提示", {
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.getList();
this.listLoading = false;
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
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.getList();
this.listLoading = false;
});
} else {
this.listLoading = true;
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.guids = params;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
console.log(
"部分选择时确认出库条件:" + JSON.stringify(this.listOutPutQuery)
);
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.getList();
this.listLoading = false;
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
this.listLoading = false;
});
}
},
/** 刷新列表 */
handleHandle(data) {

147
vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue

@ -21,7 +21,7 @@
type="success"
icon="el-icon-check"
size="mini"
@click="handleCreateBills()"
@click="print()"
>确认出库单(支持批量)</el-button
>
<el-button
@ -104,6 +104,46 @@
@pagination="getList"
/>
</div>
<div>
<el-dialog
:append-to-body="true"
:visible.sync="dialogFormVisible"
:title="formTitle"
width="700px"
>
<el-form
ref="form"
:inline="true"
:model="form"
:rules="rules"
size="small"
label-width="120px"
>
<el-form-item label="日期" prop="accountDate">
<el-date-picker
v-model="accountDatelist.accountDate"
type="date"
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="handleCreateBills()"
>确认</el-button
>
</div>
</el-dialog>
</div>
</div>
</template>
@ -180,6 +220,7 @@ export default {
version: "",
guids: "",
billNum: "",
accountDate:""
},
page: 1,
JobversionValue: "",
@ -191,6 +232,9 @@ export default {
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 230,
isEdit: false,
accountDatelist:{
accountDate:""
}
};
},
mounted() {
@ -315,99 +359,44 @@ export default {
});
});
},
print() {
this.dialogFormVisible = true;
},
//
handleCreateBills(row) {
if (this.multipleSelection.length == 0) {
this.dialogFormVisible = true;
this.listLoading = true;
this.listOutPutQuery.guids = [];
this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
if (this.accountDatelist != "") {
this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
}
//this.listOutPutQuery.accountDate = this.accountDatelist;
console.log(
"未选择时全部确认出库条件:" + JSON.stringify(this.listOutPutQuery)
);
this.$confirm("是否全部确认出库?", "提示", {
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.getList();
this.listLoading = false;
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
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.getList();
this.listLoading = false;
});
} else {
this.listLoading = true;
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.guids = params;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
console.log(
"部分选择时确认出库条件:" + JSON.stringify(this.listOutPutQuery)
);
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.getList();
this.listLoading = false;
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
this.listLoading = false;
});
}
},
/** 刷新列表 */
handleHandle(data) {

146
vue/src/views/ux/billManage/sparepartOutOrder/detail.vue

@ -29,7 +29,7 @@
size="mini"
type="warning"
icon="el-icon-download"
@click="handleCancelBills()"
@click="print()"
>取消出库(支持批量)
</el-button>
<el-input
@ -104,6 +104,45 @@
@pagination="getList"
/>
</div>
<div>
<el-dialog
:append-to-body="true"
:visible.sync="dialogFormVisible"
:title="formTitle"
width="700px"
>
<el-form
ref="form"
:inline="true"
:model="form"
:rules="rules"
size="small"
label-width="120px"
>
<el-form-item label="日期" prop="accountDate">
<el-date-picker
v-model="accountDatelist.accountDate"
type="date"
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="handleCreateBills()"
>确认</el-button
>
</div>
</el-dialog>
</div>
</div>
</template>
@ -180,6 +219,7 @@ export default {
version: "",
guids: "",
billNum: "",
accountDate:""
},
page: 1,
JobversionValue: "",
@ -191,6 +231,9 @@ export default {
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 230,
isEdit: false,
accountDatelist:{
accountDate:""
}
};
},
mounted() {
@ -315,99 +358,44 @@ export default {
});
});
},
print() {
this.dialogFormVisible = true;
},
//
handleCreateBills(row) {
if (this.multipleSelection.length == 0) {
this.dialogFormVisible = true;
this.listLoading = true;
this.listOutPutQuery.guids = [];
this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
if (this.accountDatelist != "") {
this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
}
//this.listOutPutQuery.accountDate = this.accountDatelist;
console.log(
"未选择时全部确认出库条件:" + JSON.stringify(this.listOutPutQuery)
);
this.$confirm("是否全部确认出库?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut-Pass",
this.listOutPutQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.getList();
this.listLoading = false;
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
this.$axios
.posts(
"/api/settleaccount/WMSHQFKanbanoutput/WmsHQFKanbanOutPut-Pass",
this.listOutPutQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.getList();
this.listLoading = false;
});
} else {
this.listLoading = true;
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.guids = params;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
console.log(
"部分选择时确认出库条件:" + JSON.stringify(this.listOutPutQuery)
);
this.$confirm("是否确认将选中的出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmsjitoutput/WmsJitOutPut-Pass",
this.listOutPutQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.getList();
this.listLoading = false;
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
this.listLoading = false;
});
}
},
/** 刷新列表 */
handleHandle(data) {

1
vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue

@ -294,6 +294,7 @@ export default {
tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 });
tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "状态", prop: "state", width: 100 });
return tempsTabs;
},

3
vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue

@ -173,7 +173,7 @@ export default {
rules: {
//
erpMaterialCode: [
{ required: true, message: "必须输入!", trigger: "blur" },
{ required: true, message: "必须输入!", trigger: "change" },
],
accountDate: [
{ required: true, message: "日期必须输入!", trigger: "blur" },
@ -295,6 +295,7 @@ export default {
//tempsTabs.push({ label: "", prop: "extend2", width: 120 });
tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 });
tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "状态", prop: "state", width: 100 });
return tempsTabs;
},

1
vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue

@ -293,6 +293,7 @@ export default {
//tempsTabs.push({ label: "", prop: "extend2", width: 120 });
tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 });
tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "状态", prop: "state", width: 100 });
return tempsTabs;
},

1
vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue

@ -297,6 +297,7 @@ export default {
tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 });
tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "状态", prop: "state", width: 100 });
return tempsTabs;
},

1
vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue

@ -295,6 +295,7 @@ export default {
//tempsTabs.push({ label: "", prop: "extend2", width: 120 });
tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 });
tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "状态", prop: "state", width: 100 });
return tempsTabs;
},

1
vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue

@ -294,6 +294,7 @@ export default {
tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 });
tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "状态", prop: "state", width: 100 });
return tempsTabs;
},

1
vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue

@ -296,6 +296,7 @@ export default {
tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 });
tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "状态", prop: "state", width: 100 });
return tempsTabs;
},

Loading…
Cancel
Save