|
|
@ -107,7 +107,24 @@
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<u-td>
|
|
|
|
<u-td>
|
|
|
|
<view class="u-td">
|
|
|
|
<view class="u-td">
|
|
|
|
<text>{{ prodReportItem.reportMember }}</text>
|
|
|
|
<u-select
|
|
|
|
|
|
|
|
v-model="isShowReportMember"
|
|
|
|
|
|
|
|
:default-value="prodReportItem.reportMemberIndex"
|
|
|
|
|
|
|
|
value-name="id"
|
|
|
|
|
|
|
|
label-name="realName"
|
|
|
|
|
|
|
|
:list="reportMemberList"
|
|
|
|
|
|
|
|
@confirm="
|
|
|
|
|
|
|
|
(confirm) => {
|
|
|
|
|
|
|
|
fnProReportMemberSltd(confirm, prodReportIndex);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
"
|
|
|
|
|
|
|
|
></u-select>
|
|
|
|
|
|
|
|
<u-input
|
|
|
|
|
|
|
|
@click="isShowReportMember = true"
|
|
|
|
|
|
|
|
v-model="prodReportItem.reportMemberShow"
|
|
|
|
|
|
|
|
:border="true"
|
|
|
|
|
|
|
|
height="100%"
|
|
|
|
|
|
|
|
/>
|
|
|
|
</view>
|
|
|
|
</view>
|
|
|
|
</u-td>
|
|
|
|
</u-td>
|
|
|
|
<u-td>
|
|
|
|
<u-td>
|
|
|
@ -127,7 +144,12 @@
|
|
|
|
</u-td>
|
|
|
|
</u-td>
|
|
|
|
<u-td>
|
|
|
|
<u-td>
|
|
|
|
<view class="u-td">
|
|
|
|
<view class="u-td">
|
|
|
|
<u-icon name="minus-circle" color="red" size="36"></u-icon>
|
|
|
|
<u-icon
|
|
|
|
|
|
|
|
name="minus-circle"
|
|
|
|
|
|
|
|
color="red"
|
|
|
|
|
|
|
|
size="36"
|
|
|
|
|
|
|
|
@click="fnProdReportItemDel(prodReportIndex)"
|
|
|
|
|
|
|
|
></u-icon>
|
|
|
|
</view>
|
|
|
|
</view>
|
|
|
|
</u-td>
|
|
|
|
</u-td>
|
|
|
|
</u-tr>
|
|
|
|
</u-tr>
|
|
|
@ -186,7 +208,26 @@
|
|
|
|
:key="packageReportIndex"
|
|
|
|
:key="packageReportIndex"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<u-td>
|
|
|
|
<u-td>
|
|
|
|
<view class="u-td">{{ packageReportItem.reportMember }}</view>
|
|
|
|
<view class="u-td">
|
|
|
|
|
|
|
|
<u-select
|
|
|
|
|
|
|
|
v-model="isShowReportMember"
|
|
|
|
|
|
|
|
:default-value="packageReportItem.reportMemberIndex"
|
|
|
|
|
|
|
|
value-name="id"
|
|
|
|
|
|
|
|
label-name="realName"
|
|
|
|
|
|
|
|
:list="reportMemberList"
|
|
|
|
|
|
|
|
@confirm="
|
|
|
|
|
|
|
|
(confirm) => {
|
|
|
|
|
|
|
|
fnPackageReportMemberSltd(confirm, packageReportIndex);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
"
|
|
|
|
|
|
|
|
></u-select>
|
|
|
|
|
|
|
|
<u-input
|
|
|
|
|
|
|
|
@click="isShowReportMember = true"
|
|
|
|
|
|
|
|
v-model="packageReportItem.reportMemberShow"
|
|
|
|
|
|
|
|
:border="true"
|
|
|
|
|
|
|
|
height="100%"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</view>
|
|
|
|
</u-td>
|
|
|
|
</u-td>
|
|
|
|
<u-td>
|
|
|
|
<u-td>
|
|
|
|
<view class="u-td">{{ dataItem.defectiveNum }}</view>
|
|
|
|
<view class="u-td">{{ dataItem.defectiveNum }}</view>
|
|
|
@ -203,7 +244,12 @@
|
|
|
|
</u-td>
|
|
|
|
</u-td>
|
|
|
|
<u-td>
|
|
|
|
<u-td>
|
|
|
|
<view class="u-td">
|
|
|
|
<view class="u-td">
|
|
|
|
<u-icon name="minus-circle" color="red" size="36"></u-icon>
|
|
|
|
<u-icon
|
|
|
|
|
|
|
|
name="minus-circle"
|
|
|
|
|
|
|
|
color="red"
|
|
|
|
|
|
|
|
size="36"
|
|
|
|
|
|
|
|
@click="fnPackageReportItemDel(packageReportIndex)"
|
|
|
|
|
|
|
|
></u-icon>
|
|
|
|
</view>
|
|
|
|
</view>
|
|
|
|
</u-td>
|
|
|
|
</u-td>
|
|
|
|
</u-tr>
|
|
|
|
</u-tr>
|
|
|
@ -257,28 +303,60 @@
|
|
|
|
) in dataItem.requisitionReportList"
|
|
|
|
) in dataItem.requisitionReportList"
|
|
|
|
:key="requisitionReportIndex"
|
|
|
|
:key="requisitionReportIndex"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<u-td class="u-td">{{
|
|
|
|
<u-td>
|
|
|
|
requisitionReportItem.materialCode
|
|
|
|
<view class="u-td">
|
|
|
|
}}</u-td>
|
|
|
|
<u-select
|
|
|
|
<u-td class="u-td">
|
|
|
|
v-model="isShowMaterialCode"
|
|
|
|
|
|
|
|
:default-value="requisitionReportItem.materialCodeIndex"
|
|
|
|
|
|
|
|
value-name="materialCode"
|
|
|
|
|
|
|
|
label-name="materialName"
|
|
|
|
|
|
|
|
:list="materialList"
|
|
|
|
|
|
|
|
@confirm="
|
|
|
|
|
|
|
|
(confirm) => {
|
|
|
|
|
|
|
|
fnMaterialCodeSltd(confirm, requisitionReportIndex);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
"
|
|
|
|
|
|
|
|
></u-select>
|
|
|
|
|
|
|
|
<u-input
|
|
|
|
|
|
|
|
@click="isShowMaterialCode = true"
|
|
|
|
|
|
|
|
v-model="requisitionReportItem.materialName"
|
|
|
|
|
|
|
|
:border="true"
|
|
|
|
|
|
|
|
height="100%"
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</view>
|
|
|
|
|
|
|
|
</u-td>
|
|
|
|
|
|
|
|
<u-td>
|
|
|
|
|
|
|
|
<view class="u-td">
|
|
|
|
<u-input
|
|
|
|
<u-input
|
|
|
|
v-model="requisitionReportItem.duty"
|
|
|
|
v-model="requisitionReportItem.duty"
|
|
|
|
type="number"
|
|
|
|
type="number"
|
|
|
|
:border="true"
|
|
|
|
:border="true"
|
|
|
|
height="100%"
|
|
|
|
height="100%"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
|
|
|
|
</view>
|
|
|
|
</u-td>
|
|
|
|
</u-td>
|
|
|
|
<u-td class="u-td">
|
|
|
|
<u-td>
|
|
|
|
|
|
|
|
<view class="u-td">
|
|
|
|
<u-input
|
|
|
|
<u-input
|
|
|
|
v-model="requisitionReportItem.classBalance"
|
|
|
|
v-model="requisitionReportItem.classBalance"
|
|
|
|
type="number"
|
|
|
|
type="number"
|
|
|
|
:border="true"
|
|
|
|
:border="true"
|
|
|
|
height="100%"
|
|
|
|
height="100%"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
|
|
|
|
</view>
|
|
|
|
|
|
|
|
</u-td>
|
|
|
|
|
|
|
|
<u-td>
|
|
|
|
|
|
|
|
<view class="u-td">
|
|
|
|
|
|
|
|
<u-icon
|
|
|
|
|
|
|
|
name="minus-circle"
|
|
|
|
|
|
|
|
color="red"
|
|
|
|
|
|
|
|
size="36"
|
|
|
|
|
|
|
|
@click="
|
|
|
|
|
|
|
|
fnRequisitionReportItemDel(requisitionReportIndex)
|
|
|
|
|
|
|
|
"
|
|
|
|
|
|
|
|
></u-icon>
|
|
|
|
|
|
|
|
</view>
|
|
|
|
</u-td>
|
|
|
|
</u-td>
|
|
|
|
<u-td class="u-td"
|
|
|
|
|
|
|
|
><u-icon name="minus-circle" color="red" size="36"></u-icon
|
|
|
|
|
|
|
|
></u-td>
|
|
|
|
|
|
|
|
</u-tr>
|
|
|
|
</u-tr>
|
|
|
|
</u-table>
|
|
|
|
</u-table>
|
|
|
|
</view>
|
|
|
|
</view>
|
|
|
@ -309,7 +387,7 @@
|
|
|
|
import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
|
|
|
|
import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
|
|
|
|
import { mapGetters } from "vuex";
|
|
|
|
import { mapGetters } from "vuex";
|
|
|
|
import { toProd } from "@/api/yys/materialProcurementOrder.js";
|
|
|
|
import { toProd } from "@/api/yys/materialProcurementOrder.js";
|
|
|
|
import { userList } from "@/api/yys/dayWork.js";
|
|
|
|
import { userList, materialInformationList, sure } from "@/api/yys/dayWork.js";
|
|
|
|
import dayjs from "dayjs";
|
|
|
|
import dayjs from "dayjs";
|
|
|
|
export default {
|
|
|
|
export default {
|
|
|
|
components: {},
|
|
|
|
components: {},
|
|
|
@ -321,6 +399,8 @@ export default {
|
|
|
|
dataItem: {},
|
|
|
|
dataItem: {},
|
|
|
|
productionTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
|
|
|
|
productionTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
|
|
|
|
isShowPickerA: false,
|
|
|
|
isShowPickerA: false,
|
|
|
|
|
|
|
|
isShowReportMember: false,
|
|
|
|
|
|
|
|
isShowMaterialCode: false,
|
|
|
|
pickerParams: {
|
|
|
|
pickerParams: {
|
|
|
|
year: true,
|
|
|
|
year: true,
|
|
|
|
month: true,
|
|
|
|
month: true,
|
|
|
@ -329,16 +409,24 @@ export default {
|
|
|
|
minute: true,
|
|
|
|
minute: true,
|
|
|
|
second: true,
|
|
|
|
second: true,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
reportMemberList: [],
|
|
|
|
|
|
|
|
materialList: [],
|
|
|
|
prodReportItemO: {
|
|
|
|
prodReportItemO: {
|
|
|
|
reportMember: undefined,
|
|
|
|
reportMember: undefined,
|
|
|
|
|
|
|
|
reportMemberIndex: [],
|
|
|
|
|
|
|
|
reportMemberShow: undefined,
|
|
|
|
compensatoryHour: undefined,
|
|
|
|
compensatoryHour: undefined,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
packageReportItemO: {
|
|
|
|
packageReportItemO: {
|
|
|
|
|
|
|
|
reportMemberShow: undefined,
|
|
|
|
|
|
|
|
reportMemberIndex: [],
|
|
|
|
reportMember: undefined,
|
|
|
|
reportMember: undefined,
|
|
|
|
compensatoryHour: undefined,
|
|
|
|
compensatoryHour: undefined,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
requisitionReportItemO: {
|
|
|
|
requisitionReportItemO: {
|
|
|
|
materialCode: undefined,
|
|
|
|
materialCode: undefined,
|
|
|
|
|
|
|
|
materialCodeIndex: [],
|
|
|
|
|
|
|
|
materialName: undefined,
|
|
|
|
duty: undefined,
|
|
|
|
duty: undefined,
|
|
|
|
classBalance: undefined,
|
|
|
|
classBalance: undefined,
|
|
|
|
},
|
|
|
|
},
|
|
|
@ -359,7 +447,8 @@ export default {
|
|
|
|
if (!dataItem.requisitionReportList) {
|
|
|
|
if (!dataItem.requisitionReportList) {
|
|
|
|
dataItem.requisitionReportList = [];
|
|
|
|
dataItem.requisitionReportList = [];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.fnUserList();
|
|
|
|
this.fnReportMemberList();
|
|
|
|
|
|
|
|
this.fnMaterialInformationList();
|
|
|
|
this.dataItem = dataItem;
|
|
|
|
this.dataItem = dataItem;
|
|
|
|
this.productionNumber = undefined;
|
|
|
|
this.productionNumber = undefined;
|
|
|
|
this.productionTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
|
|
|
|
this.productionTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
|
|
|
@ -370,21 +459,8 @@ export default {
|
|
|
|
this.isShow = false;
|
|
|
|
this.isShow = false;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
fnOk() {
|
|
|
|
fnOk() {
|
|
|
|
if (!this.productionNumber) {
|
|
|
|
let _params = { ...this.dataItem };
|
|
|
|
this.$refs.uTips.show({
|
|
|
|
sure(_params)
|
|
|
|
title: "数量不能为空",
|
|
|
|
|
|
|
|
type: "error",
|
|
|
|
|
|
|
|
duration: "2300",
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
console.log(this.productionNumber);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
let _params = {
|
|
|
|
|
|
|
|
orderNumber: this.dataItem.orderNumber,
|
|
|
|
|
|
|
|
productionTime: dayjs(this.productionTime),
|
|
|
|
|
|
|
|
productionNumber: this.productionNumber,
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
toProd(_params)
|
|
|
|
|
|
|
|
.then((res) => {
|
|
|
|
.then((res) => {
|
|
|
|
if (res.code == 200) {
|
|
|
|
if (res.code == 200) {
|
|
|
|
this.$emit("evtRefresh");
|
|
|
|
this.$emit("evtRefresh");
|
|
|
@ -412,11 +488,11 @@ export default {
|
|
|
|
":" +
|
|
|
|
":" +
|
|
|
|
timeObj.second;
|
|
|
|
timeObj.second;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
fnUserList() {
|
|
|
|
fnReportMemberList() {
|
|
|
|
userList()
|
|
|
|
userList()
|
|
|
|
.then((res) => {
|
|
|
|
.then((res) => {
|
|
|
|
if (res.code == 200) {
|
|
|
|
if (res.code == 200) {
|
|
|
|
console.log(res);
|
|
|
|
this.reportMemberList = res.data;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.catch((err) => {
|
|
|
|
.catch((err) => {
|
|
|
@ -424,13 +500,95 @@ export default {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
fnProdReportItemAdd() {
|
|
|
|
fnProdReportItemAdd() {
|
|
|
|
this.dataItem.prodReportList.push(this.prodReportItemO);
|
|
|
|
this.dataItem.prodReportList.push({ ...this.prodReportItemO });
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
fnProdReportItemDel(index) {
|
|
|
|
|
|
|
|
this.dataItem.prodReportList.splice(index, 1);
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
fnProReportMemberSltd(row, index) {
|
|
|
|
|
|
|
|
this.dataItem.prodReportList[index]["reportMember"] = row[0]["value"];
|
|
|
|
|
|
|
|
this.fnProReportMemberFind(
|
|
|
|
|
|
|
|
this.dataItem.prodReportList[index]["reportMember"],
|
|
|
|
|
|
|
|
index
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
fnProReportMemberFind(reportMember, index) {
|
|
|
|
|
|
|
|
let _list = [...this.reportMemberList];
|
|
|
|
|
|
|
|
let _reportMember = _list.find((o1) => {
|
|
|
|
|
|
|
|
return o1.id == reportMember;
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
let _reportMemberIndex = _list.indexOf(_reportMember);
|
|
|
|
|
|
|
|
this.dataItem.prodReportList[index]["reportMemberIndex"] = [
|
|
|
|
|
|
|
|
_reportMemberIndex,
|
|
|
|
|
|
|
|
];
|
|
|
|
|
|
|
|
this.dataItem.prodReportList[index]["reportMemberShow"] =
|
|
|
|
|
|
|
|
_reportMember.realName;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
fnPackageReportItemAdd() {
|
|
|
|
fnPackageReportItemAdd() {
|
|
|
|
this.dataItem.packageReportList.push(this.packageReportItemO);
|
|
|
|
this.dataItem.packageReportList.push({ ...this.packageReportItemO });
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
fnPackageReportItemDel(index) {
|
|
|
|
|
|
|
|
this.dataItem.packageReportList.splice(index, 1);
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
fnPackageReportMemberSltd(row, index) {
|
|
|
|
|
|
|
|
this.dataItem.packageReportList[index]["reportMember"] = row[0]["value"];
|
|
|
|
|
|
|
|
this.fnPackageReportMemberFind(
|
|
|
|
|
|
|
|
this.dataItem.packageReportList[index]["reportMember"],
|
|
|
|
|
|
|
|
index
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
fnPackageReportMemberFind(reportMember, index) {
|
|
|
|
|
|
|
|
let _list = [...this.reportMemberList];
|
|
|
|
|
|
|
|
let _reportMember = _list.find((o1) => {
|
|
|
|
|
|
|
|
return o1.id == reportMember;
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
let _reportMemberIndex = _list.indexOf(_reportMember);
|
|
|
|
|
|
|
|
this.dataItem.packageReportList[index]["reportMemberIndex"] = [
|
|
|
|
|
|
|
|
_reportMemberIndex,
|
|
|
|
|
|
|
|
];
|
|
|
|
|
|
|
|
this.dataItem.packageReportList[index]["reportMemberShow"] =
|
|
|
|
|
|
|
|
_reportMember.realName;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
fnRequisitionReportItemAdd() {
|
|
|
|
fnRequisitionReportItemAdd() {
|
|
|
|
this.dataItem.requisitionReportList.push(this.requisitionReportItemO);
|
|
|
|
this.dataItem.requisitionReportList.push({
|
|
|
|
|
|
|
|
...this.requisitionReportItemO,
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
fnRequisitionReportItemDel(index) {
|
|
|
|
|
|
|
|
this.dataItem.requisitionReportList.splice(index, 1);
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
fnMaterialInformationList() {
|
|
|
|
|
|
|
|
materialInformationList()
|
|
|
|
|
|
|
|
.then((res) => {
|
|
|
|
|
|
|
|
if (res.code == 200) {
|
|
|
|
|
|
|
|
console.log(res);
|
|
|
|
|
|
|
|
this.materialList = res.data;
|
|
|
|
|
|
|
|
//this.reportMemberList = res.data;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
.catch((err) => {
|
|
|
|
|
|
|
|
console.log(err);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
fnMaterialCodeSltd(row, index) {
|
|
|
|
|
|
|
|
this.dataItem.requisitionReportList[index]["materialCode"] =
|
|
|
|
|
|
|
|
row[0]["value"];
|
|
|
|
|
|
|
|
this.fnMaterialCodeFind(
|
|
|
|
|
|
|
|
this.dataItem.requisitionReportList[index]["materialCode"],
|
|
|
|
|
|
|
|
index
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
fnMaterialCodeFind(materialCode, index) {
|
|
|
|
|
|
|
|
let _list = [...this.materialList];
|
|
|
|
|
|
|
|
let _material = _list.find((o1) => {
|
|
|
|
|
|
|
|
return o1.materialCode == materialCode;
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
let _materialCodeIndex = _list.indexOf(_material);
|
|
|
|
|
|
|
|
this.dataItem.requisitionReportList[index]["materialCodeIndex"] = [
|
|
|
|
|
|
|
|
_materialCodeIndex,
|
|
|
|
|
|
|
|
];
|
|
|
|
|
|
|
|
this.dataItem.requisitionReportList[index]["materialName"] =
|
|
|
|
|
|
|
|
_material.materialName;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
};
|
|
|
|
};
|
|
|
|