|
|
@@ -16,7 +16,7 @@
|
|
|
>{{ countMsg.joinTotalNum }}PCS</li
|
|
|
>
|
|
|
<li>
|
|
|
- <span class="label">累计包装品数量</span
|
|
|
+ <span class="label">累计包装数量</span
|
|
|
>{{ countMsg.packTotalNum }}PCS</li
|
|
|
>
|
|
|
<li>
|
|
|
@@ -48,7 +48,7 @@
|
|
|
type="datetime"
|
|
|
format="yyyy-MM-dd HH:mm:ss"
|
|
|
placeholder="请选择"
|
|
|
- :disabled="formData.dateType==2"
|
|
|
+ :disabled="formData.dateType == 2"
|
|
|
></el-date-picker
|
|
|
></el-form-item>
|
|
|
</div>
|
|
|
@@ -176,21 +176,20 @@
|
|
|
type: Object,
|
|
|
default: () => ({})
|
|
|
},
|
|
|
- formData: {
|
|
|
- type: Object,
|
|
|
- default: () => ({})
|
|
|
- },
|
|
|
- firstInfo:{
|
|
|
- type: Object,
|
|
|
- default: () => ({})
|
|
|
- },
|
|
|
- currentInfo:{
|
|
|
- type: Object,
|
|
|
- default: () => ({})
|
|
|
- }
|
|
|
-
|
|
|
+ formData: {
|
|
|
+ type: Object,
|
|
|
+ default: () => ({})
|
|
|
+ },
|
|
|
+ firstInfo: {
|
|
|
+ type: Object,
|
|
|
+ default: () => ({})
|
|
|
+ },
|
|
|
+ currentInfo: {
|
|
|
+ type: Object,
|
|
|
+ default: () => ({})
|
|
|
+ }
|
|
|
},
|
|
|
- data () {
|
|
|
+ data() {
|
|
|
return {
|
|
|
packageRequirements: '',
|
|
|
columns: [
|
|
|
@@ -230,8 +229,7 @@
|
|
|
{
|
|
|
label: '最小包装单元',
|
|
|
prop: 'index',
|
|
|
- formatter: (row) =>
|
|
|
- `${row.measuringUnit}/${row.packingUnit}`
|
|
|
+ formatter: (row) => `${row.measuringUnit}/${row.packingUnit}`
|
|
|
},
|
|
|
{
|
|
|
label: '数量',
|
|
|
@@ -284,7 +282,7 @@
|
|
|
watch: {
|
|
|
taskInfo: {
|
|
|
immediate: true,
|
|
|
- handler () {
|
|
|
+ handler() {
|
|
|
if (this.taskInfo.code) {
|
|
|
this.getReportCount();
|
|
|
}
|
|
|
@@ -292,40 +290,44 @@
|
|
|
},
|
|
|
infoData: {
|
|
|
immediate: true,
|
|
|
- handler () {
|
|
|
+ handler() {
|
|
|
if (this.infoData.code) {
|
|
|
this._getPackageList();
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
- formData: {
|
|
|
- immediate: true,
|
|
|
- handler () {
|
|
|
- if (this.formData.dateType==2) {
|
|
|
- this.$set(this.workReport,'executeTime',this.formData.appointTime);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ formData: {
|
|
|
+ immediate: true,
|
|
|
+ handler() {
|
|
|
+ if (this.formData.dateType == 2) {
|
|
|
+ this.$set(
|
|
|
+ this.workReport,
|
|
|
+ 'executeTime',
|
|
|
+ this.formData.appointTime
|
|
|
+ );
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
},
|
|
|
- created () {
|
|
|
+ created() {
|
|
|
this.workReport.executorId = this.$store.state.user.info?.userId;
|
|
|
this.workReport.executorJobNum = this.$store.state.user.info?.jobNumber;
|
|
|
},
|
|
|
methods: {
|
|
|
- async _getPackageList () {
|
|
|
+ async _getPackageList() {
|
|
|
const res = await getPackageList(this.infoData.code);
|
|
|
|
|
|
this.packageList = res;
|
|
|
},
|
|
|
- handleDelete (index) {
|
|
|
+ handleDelete(index) {
|
|
|
this.$confirm('确定删除?', '提示').then(() => {
|
|
|
this.workReportCategoryList.splice(index, 1);
|
|
|
});
|
|
|
},
|
|
|
- addMaterial () {
|
|
|
+ addMaterial() {
|
|
|
this.$refs.ChooseMaterialRef.open(this.workReportCategoryList.slice(0));
|
|
|
},
|
|
|
- materialSuccess (list) {
|
|
|
+ materialSuccess(list) {
|
|
|
const obj = {};
|
|
|
this.workReportCategoryList = [
|
|
|
...this.workReportCategoryList,
|
|
|
@@ -351,7 +353,7 @@
|
|
|
return next;
|
|
|
}, []);
|
|
|
},
|
|
|
- async getReportCount () {
|
|
|
+ async getReportCount() {
|
|
|
const res = await reportCount({
|
|
|
taskCode: this.taskInfo.code,
|
|
|
lastTaskCode: this.taskInfo.lastTaskCode,
|
|
|
@@ -360,8 +362,8 @@
|
|
|
|
|
|
this.countMsg = res;
|
|
|
},
|
|
|
- getMsg () {},
|
|
|
- report (fun) {
|
|
|
+ getMsg() {},
|
|
|
+ report(fun) {
|
|
|
this.$refs.formRef.validate((value) => {
|
|
|
if (value) {
|
|
|
if (!this.workReportCategoryList?.length) {
|