@@ -473,6 +475,7 @@
import ChangeRecord from "./com_project_change_record.vue";
import OssComponents from "../../oss/ossComponents.vue";
import toolApply from "./com_project_toolApplyCation.vue";
+ import { Divider } from 'element-ui';
/*組件*/
export default {
components: {
@@ -490,6 +493,7 @@
technicalSpecification,
quotationHeader,
toolApply,
+ ElDivider: Divider,
},
name: "null",
data() {
diff --git a/src/views/modules/project/projectPart/searchProjectPart.vue b/src/views/modules/project/projectPart/searchProjectPart.vue
index 0ef243f..5ee6062 100644
--- a/src/views/modules/project/projectPart/searchProjectPart.vue
+++ b/src/views/modules/project/projectPart/searchProjectPart.vue
@@ -133,7 +133,7 @@
@@ -1060,7 +1060,8 @@
status: true,
fixed: '',
columnWidth: 70
- }, {
+ },
+ {
userId: this.$store.state.user.name,
functionId: 106002,
serialNumber: '106002Table2QuotationNo',
@@ -1620,6 +1621,12 @@
this.modelFlag=true
},
changeSum() {
+ if(row.standardCost<0||row.standardCost==null||row.standardCost==''){
+ row.standardCost=''
+ this.$alert('成本不能为负数或者不填', '错误', {
+ confirmButtonText: '确定'
+ })
+ }
this.dataForm.applySumQty = 0
this.dataForm.totalCost =0
for (const item of this.toolData) {
@@ -1809,6 +1816,7 @@
},
activated() {
if (this.$route.params.type === 'tokenLogin') {
+ console.log("进来啦")
if (this.$route.params.docNo) {
this.searchData.applyNo = this.$route.params.docNo
}
@@ -1824,6 +1832,7 @@
if(this.dataList1.length>0){
this.$refs.mainTable.setCurrentRow(this.dataList1[0]);
this.currentRow = JSON.parse( JSON.stringify(this.dataList1[0]));
+ //进入审批界面
this.editModal(this.dataList1[0])
}else {
this.currentRow ={}
@@ -1832,8 +1841,34 @@
}
this.dataListLoading = false
})
- } else {
+ }
+ if (localStorage.getItem('ToolApplyData') != null) {
+ let data = JSON.parse(localStorage.getItem('ToolApplyData'));
+ if (data){
+ this.searchData.applyNo = data.applyNo
+ }
+ this.searchData.limit = this.pageSize
+ this.searchData.page = this.pageIndex
+ console.log(this.searchData)
+ searchProjectToolApplyHeader(this.searchData).then(({data}) => {
+ if (data.code == 0) {
+ this.dataList1 = data.page.list
+ this.pageIndex = data.page.currPage
+ this.pageSize = data.page.pageSize
+ this.totalPage = data.page.totalCount
+ if(this.dataList1.length>0){
+ this.$refs.mainTable.setCurrentRow(this.dataList1[0]);
+ this.currentRow = JSON.parse( JSON.stringify(this.dataList1[0]));
+ //进入编辑界面
+ this.editModalU(this.dataList1[0])
+ }else {
+ this.currentRow ={}
+ }
+ this.refreshCurrentTabTable ()
+ }
+ this.dataListLoading = false
+ })
}
},
}
diff --git a/src/views/modules/tooling/toolingInfo.vue b/src/views/modules/tooling/toolingInfo.vue
index 0f4929c..59363e4 100644
--- a/src/views/modules/tooling/toolingInfo.vue
+++ b/src/views/modules/tooling/toolingInfo.vue
@@ -14,7 +14,7 @@
-
+
@@ -122,7 +122,9 @@
采购员
-
+
+ 跳转至申请记录
+
@@ -147,7 +149,7 @@
v-loading="dataListLoading"
style="width: 100%;">
-
+
@@ -158,11 +160,14 @@
-
-
+
+
+
+
@@ -492,6 +497,7 @@
columnWidth: 80
},
],
+ jumpFlag:true,
dataForm:{
site: '',
applyNo: '',
@@ -699,15 +705,16 @@
detailList:[],
};
this.visible=true;
+ this.jumpFlag=true;
},
changeSum(row){
- // if(row.applyQty!=null&&row.applyQty!==''&& row.toolQuantity item.applyQty > 0)
+ this.dataForm.detailList=this.toolData.filter(item => item.applyQty > 0).filter(item => item.standardCost > 0)
saveProjectToolApply(this.dataForm).then(({data}) => {
if (data && data.code == 0) {
this.visible=false;
@@ -790,6 +797,19 @@
onClose: () => {
}
})
+ if(this.jumpFlag){
+ this.$nextTick(function () {
+ setTimeout(() => {
+ let inData = {
+ site: this.$store.state.user.site,
+ applyNo: data.applyNo,
+ username: this.$store.state.user.name
+ };
+ localStorage.setItem('ToolApplyData', JSON.stringify(inData))
+ this.$router.push('tooling-searchToolApply')
+ },500)
+ })
+ }
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'