|
@@ -181,59 +181,59 @@
|
|
|
:edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '-'}"
|
|
|
:edit-rules="validRules"
|
|
|
>
|
|
|
- <vxe-table-column field="wareHouseMan" title="入库人" :edit-render="{}" :rules="[{required: true, message:'请选择入库人', trigger:'blur'}]">
|
|
|
+ <vxe-table-column align="center" field="wareHouseMan" title="入库人" :edit-render="{}" :rules="[{required: true, message:'请选择入库人', trigger:'blur'}]">
|
|
|
<template v-slot:edit="scope">
|
|
|
<el-input v-model="scope.row.wareHouseMan" @focus="userPullListForm(scope.$rowIndex)"></el-input>
|
|
|
</template>
|
|
|
</vxe-table-column>
|
|
|
- <vxe-table-column field="wareHouseManOffice" title="入库部门" :edit-render="{}">
|
|
|
+ <vxe-table-column align="center" field="wareHouseManOffice" title="入库部门" :edit-render="{}">
|
|
|
<template v-slot:edit="scope">
|
|
|
<el-input :disabled='true' v-model="scope.row.wareHouseManOffice" ></el-input>
|
|
|
</template>
|
|
|
</vxe-table-column>
|
|
|
- <vxe-table-column field="wareHouseType" title="入库类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]">
|
|
|
+ <vxe-table-column align="center" field="wareHouseType" title="入库类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]">
|
|
|
<template v-slot:edit="scope">
|
|
|
<el-input v-model="scope.row.wareHouseType" @focus="typePullForm(scope.$rowIndex)"></el-input>
|
|
|
</template>
|
|
|
</vxe-table-column>
|
|
|
- <vxe-table-column field="tradeName" width="250" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
|
|
|
+ <vxe-table-column align="center" field="tradeName" width="250" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
|
|
|
<template v-slot:edit="scope">
|
|
|
<el-input @change="ifSameValue" maxlength="64" v-model="scope.row.tradeName"></el-input>
|
|
|
</template>
|
|
|
</vxe-table-column>
|
|
|
|
|
|
- <vxe-table-column field="tradeNumber" title="商品数量" :edit-render="{}">
|
|
|
+ <vxe-table-column align="center" field="tradeNumber" title="商品数量" :edit-render="{}">
|
|
|
<template v-slot:edit="scope">
|
|
|
<el-input @change="changeValue2" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>
|
|
|
</template>
|
|
|
</vxe-table-column>
|
|
|
- <vxe-table-column field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
|
|
|
+ <vxe-table-column align="center" field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
|
|
|
<template v-slot:edit="scope">
|
|
|
<el-input maxlength="64" v-model="scope.row.company"></el-input>
|
|
|
</template>
|
|
|
</vxe-table-column>
|
|
|
- <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
|
|
|
+ <vxe-table-column align="center" field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
|
|
|
<template v-slot:edit="scope">
|
|
|
<el-input @change="changeValue2" maxlength="15" v-model="scope.row.tradePrice" @blur="scope.row.tradePrice = twoDecimalPlaces2(scope.row.tradePrice)"></el-input>
|
|
|
</template>
|
|
|
</vxe-table-column>
|
|
|
- <vxe-table-column field="priceSum" title="商品总价" :edit-render="{}">
|
|
|
+ <vxe-table-column align="center" field="priceSum" title="商品总价" :edit-render="{}">
|
|
|
<template v-slot:edit="scope">
|
|
|
<el-input :disabled='true' v-model="scope.row.priceSum" @blur="scope.row.priceSum = twoDecimalPlaces(scope.row.priceSum)" maxlength="15"></el-input>
|
|
|
</template>
|
|
|
</vxe-table-column>
|
|
|
- <vxe-table-column field="actualPrice" title="实际价格" :edit-render="{}">
|
|
|
+ <vxe-table-column align="center" field="actualPrice" title="实际价格" :edit-render="{}">
|
|
|
<template v-slot:edit="scope">
|
|
|
<el-input v-model="scope.row.actualPrice" @blur="scope.row.actualPrice = twoDecimalPlaces(scope.row.actualPrice)" maxlength="15"></el-input>
|
|
|
</template>
|
|
|
</vxe-table-column>
|
|
|
|
|
|
- <vxe-table-column field="remarks" title="备注" :edit-render="{}">
|
|
|
+ <vxe-table-column align="center" field="remarks" title="备注" :edit-render="{}">
|
|
|
<template v-slot:edit="scope">
|
|
|
<el-input maxlength="255" v-model="scope.row.remarks" ></el-input>
|
|
|
</template>
|
|
|
</vxe-table-column>
|
|
|
- <vxe-table-column title="操作" width="180">
|
|
|
+ <vxe-table-column align="center" title="操作" width="180">
|
|
|
<template v-slot="scope">
|
|
|
<el-button size="mini" type="danger" v-if="!formReadOnly" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
|
|
|
<el-button size="mini" type="primary" v-if="!formReadOnly" @click="sss2(scope.$rowIndex)">上传附件</el-button>
|
|
@@ -519,8 +519,8 @@
|
|
|
this.loading = true
|
|
|
if (this.commonJS.isNotEmpty(this.inputForm.id)) {
|
|
|
this.wareHouseService.findById(this.inputForm.id).then(({data}) => {
|
|
|
- // 审核状态不是“未发起”或“暂存”或“撤回”,就弹出提示
|
|
|
- if (this.commonJS.isNotEmpty(data.status) && data.status !== '0' && data.status !== '1' && data.status !== '3') {
|
|
|
+ // 审核状态不是“未发起”或“暂存”或“撤回”或“已完成”,就弹出提示
|
|
|
+ if (this.commonJS.isNotEmpty(data.status) && data.status !== '0' && data.status !== '1' && data.status !== '3' && data.status !== '5') {
|
|
|
this.loading = false
|
|
|
this.$message.error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
|
|
|
throw new Error('任务数据已发生改变或不存在,请在待办任务中确认此任务是否存在')
|
|
@@ -918,3 +918,9 @@
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
+<style scoped>
|
|
|
+ .el-divider__text {
|
|
|
+ font-size: 16px;
|
|
|
+ font-weight: bold;
|
|
|
+ }
|
|
|
+</style>
|