2024.11.25 审批优化

src/views/modules/auth/authInquiry.vue

@@ -87,7 +87,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item :label="' '">
-        <el-button @click="getDataList()">查询</el-button>
+        <el-button @click="getDataListAll()">查询</el-button>
 <!--        <download-excel-->
 <!--          :fields="fields()"-->
 <!--          :data="exportData"-->
@@ -316,6 +316,27 @@ export default {
         limit: 10,
         menuId: this.$route.meta.menuId,
       },
+      searchData1: {
+        userId: this.$store.state.user.id,
+        site: this.$store.state.user.site,
+        id: '',
+        customerNo: '',
+        customerDesc: '',
+        rfqNo: '',
+        bu: '',
+        requestStartDate: '',
+        requestEndDate: '',
+        requiredCompletionStartDate: '',
+        requiredCompletionEndDate: '',
+        status: '',
+        quoterName: '',
+        requesterName: '',
+        priorityLevel: '',
+        orderRef1: 'XJ',
+        page: 1,
+        limit: 10,
+        menuId: this.$route.meta.menuId,
+      },
       // 其它
       dataListLoading: false,
       // 选择项目弹框开关
@@ -740,6 +761,12 @@ export default {
   },
   created() {
     this.getSiteAndBuByUserName()
+    // 获取 URL 查询参数
+    const {rfqNo} = this.$route.query;
+    // 将查询参数赋值给 searchData
+    if (rfqNo){
+      this.searchData1.rfqNo = this.$route.query.rfqNo;
+    }
     this.getDataList()
   },
   methods: {
@@ -816,10 +843,21 @@ export default {
     /**
      * 获取数据列表
      */
+    getDataListAll(){
+      this.searchData1 = null
+      this.getDataList()
+    },
+
     getDataList() {
       this.searchData.limit = this.pageSize
       this.searchData.page = this.pageIndex
-      searchUserAuthInquiryApplicationInfo(this.searchData).then(({data}) => {
+      let inData = this.searchData
+      if (this.searchData1 !== null){
+        this.searchData1.limit = this.pageSize
+        this.searchData1.page = this.pageIndex
+        inData = this.searchData1
+      }
+      searchUserAuthInquiryApplicationInfo(inData).then(({data}) => {
         if (data.code === 0) {
           this.dataList = data.page.list
           this.pageIndex = data.page.currPage

src/views/modules/auth/authQuote.vue

@@ -71,7 +71,7 @@
         </el-col>
         <el-col :span="3">
           <el-form-item label=" ">
-            <el-button @click="getDataList">查 询</el-button>
+            <el-button @click="getDataListAll">查 询</el-button>
           </el-form-item>
         </el-col>
       </el-row>
@@ -79,10 +79,11 @@
 
     <!-- 询价列表 -->
     <el-table
-      height="75vh"
+      height="30vh"
       :data="dataList"
       border
       ref="mainTable"
+      highlight-current-row
       @row-click="quoteClickRow"
       @current-change="changeCurrentRow"
       v-loading="dataListLoading"
@@ -124,6 +125,34 @@
                    layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
+    <el-tabs style="margin-top: 0px; width: 100%; height: 100%;" v-model="activeName" class="customer-tab" type="border-card" @tab-click="tabClick">
+      <el-tab-pane label="报价信息" name="quotationInformation">
+        <el-form :inline="true" label-width="120px" label-position="top">
+          <el-form-item label="Application">
+            <el-input v-model="quoteCurrentRow.application" style="width: 210px" readonly></el-input>
+          </el-form-item>
+          <el-form-item label="Customer">
+            <el-input v-model="quoteCurrentRow.customerDesc" readonly></el-input>
+          </el-form-item>
+          <el-form-item label="年需求量">
+            <el-input-number v-model="quoteCurrentRow.annualDemand" readonly :controls="false"></el-input-number>
+          </el-form-item>
+          <el-form-item label="Cost Model">
+            <el-input v-model="quoteCurrentRow.costModel" style="width: 210px" readonly></el-input>
+          </el-form-item>
+          <el-form-item label="Markup">
+            <el-input-number v-model="quoteCurrentRow.markup" readonly :controls="false"></el-input-number>
+          </el-form-item>
+        </el-form>
+        <el-form :inline="true" label-width="120px" label-position="top">
+          <el-form-item label="报价备注">
+            <el-input type="textarea" :rows="2" v-model="quoteCurrentRow.remark" style="width: 1019px" readonly></el-input>
+          </el-form-item>
+        </el-form>
+        <tp-cost :quote-detail="quoteCurrentRow" height="36vh" style="margin-top: 10px"></tp-cost>
+      </el-tab-pane>
+    </el-tabs>
+
     <el-dialog title="申请单审核" :visible.sync="reviewFlag" width="520px" :close-on-click-modal="false"
                v-drag>
       <el-row>
@@ -183,6 +212,7 @@ import {
 } from "../../../api/quote/quote";
 import quotationUpload from "../quote/quotation_upload.vue";
 import {updateAuthHist} from "../../../api/auth/auth";
+import TpCost from "../quote/detail/tpCost.vue";
 
 export default {
   computed: {
@@ -200,6 +230,7 @@ export default {
     //   },
   },
   components: {
+    TpCost,
     quotationUpload,
     DictDataSelect,
     Chooselist
@@ -216,6 +247,7 @@ export default {
       copyPriceCheckDetail:{},
       loading:false,
       attributeDialog:true,
+      activeName: 'quotationInformation',
       priceCheckRule: {
         associatedPartNo:[{required: true, message: ' ', trigger: 'change'},],
         materialRequired:[{required: true, message: ' ', trigger: 'change'},],
@@ -267,6 +299,27 @@ export default {
         limit: 10,
         menuId: this.$route.meta.menuId,
       },
+      searchData1: {
+        userId: this.$store.state.user.id,
+        site: this.$store.state.user.site,
+        id: '',
+        customerNo: '',
+        customerDesc: '',
+        quoteVersionNo: '',
+        bu: '',
+        requestStartDate: '',
+        requestEndDate: '',
+        requiredCompletionStartDate: '',
+        requiredCompletionEndDate: '',
+        status: '',
+        quoterName: '',
+        requesterName: '',
+        priorityLevel: '',
+        orderRef1: 'BJ',
+        page: 1,
+        limit: 10,
+        menuId: this.$route.meta.menuId,
+      },
       // 其它
       dataListLoading: false,
       // 选择项目弹框开关
@@ -571,7 +624,7 @@ export default {
           columnProp: 'authHistRemark',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '备注',
+          columnLabel: '审批备注',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -671,6 +724,12 @@ export default {
   },
   created() {
     this.getSiteAndBuByUserName()
+    // 获取 URL 查询参数
+    const {quoteVersionNo} = this.$route.query;
+    // 将查询参数赋值给 searchData
+    if (quoteVersionNo){
+      this.searchData1.quoteVersionNo = this.$route.query.quoteVersionNo;
+    }
     this.getDataList()
   },
   methods: {
@@ -723,6 +782,7 @@ export default {
      */
     quoteClickRow(row) {
       this.quoteCurrentRow = JSON.parse(JSON.stringify(row))
+      this.quoteCurrentRow.id = row.quoteDetailId
     },
     /**
      * 当前值发生变化的时候修改
@@ -733,6 +793,7 @@ export default {
       // 判断是否是获取焦点的事件
       if (row) {
         this.quoteCurrentRow = JSON.parse(JSON.stringify(row))
+        this.quoteCurrentRow.id = row.quoteDetailId
         //刷新当前页表
         this.refreshCurrentTabTable()
       }
@@ -747,10 +808,22 @@ export default {
     /**
      * 获取数据列表
      */
+    getDataListAll(){
+      this.searchData1 = null
+      this.getDataList()
+    },
+
     getDataList() {
+      console.log(this.searchData1)
       this.searchData.limit = this.pageSize
       this.searchData.page = this.pageIndex
-      searchUserAuthQuoteApplicationInfo(this.searchData).then(({data}) => {
+      let inData = this.searchData
+      if (this.searchData1 !== null){
+        this.searchData1.limit = this.pageSize
+        this.searchData1.page = this.pageIndex
+        inData = this.searchData1
+      }
+      searchUserAuthQuoteApplicationInfo(inData).then(({data}) => {
         if (data.code === 0) {
           this.dataList = data.page.list
           this.pageIndex = data.page.currPage

src/views/modules/auth/authRule.vue

@@ -1219,13 +1219,18 @@ export default {
         lastStepFlag: 'N',
         createBy: this.$store.state.user.name,
       }
-      // 遍历数据列表，判断步骤号，每次新增步骤号+10
-      let stepNoList = []
-      for (let i = 0; i < this.ruleStepDataList.length; i++) {
-        stepNoList.push(this.ruleStepDataList[i].stepNo)
-      }
-      if (stepNoList.length > 0) {
-        this.ruleStepModalData.stepNo = Math.max.apply(null, stepNoList) + 10
+      if (this.ruleStepDataList.length === 0) {
+        this.ruleStepModalData.firstStepFlag = 'Y'
+      }else {
+        this.ruleStepModalData.firstStepFlag = 'N'
+        // 遍历数据列表，判断步骤号，每次新增步骤号+10
+        let stepNoList = []
+        for (let i = 0; i < this.ruleStepDataList.length; i++) {
+          stepNoList.push(this.ruleStepDataList[i].stepNo)
+        }
+        if (stepNoList.length > 0) {
+          this.ruleStepModalData.stepNo = Math.max.apply(null, stepNoList) + 10
+        }
       }
       this.ruleStepModalDisableFlag = false
       this.ruleStepModalFlag = true
@@ -1438,6 +1443,13 @@ export default {
             }
           }
         }
+      } else {
+        if (this.ruleStepModalData.firstStepFlag === 'N') {
+          this.$alert('该审批步骤下缺少首步骤！', '提示', {
+            confirmButtonText: '确定'
+          })
+          return
+        }
       }
       if (this.ruleStepModalData.firstStepFlag === 'Y') {
         this.ruleStepModalData.lastStepFlag = 'N'
@@ -1472,6 +1484,12 @@ export default {
         } else {
           this.ruleStepModalData.authTypeDb = 'G'
         }
+        if (this.ruleStepDataList.length === 1 && this.ruleStepModalData.firstStepFlag === 'N') {
+          this.$alert('该审批步骤下缺少首步骤！', '提示', {
+            confirmButtonText: '确定'
+          })
+          return
+        }
         authRuleStepEdit(this.ruleStepModalData).then(({data}) => {
           if (data && data.code === 0) {
             this.getRuleStepDataList()