2024-09-30

src/views/modules/quotation/priceCheckProperties.vue

@@ -25,9 +25,13 @@ export default {
       default: ()=>[],
     },
     height:{
-      type:Number,
+      type:[Number,String],
       default:300
     },
+    disabled:{
+      type:Boolean,
+      default:false
+    }
   },
   model:{
     prop:"dataList",
@@ -306,9 +310,8 @@ export default {
 <template>
   <div>
     <div style="margin-top: 5px">
-<!--      <el-button type="primary" :loading="loading" v-if="quotationNo" @click="searchPriceCheckPropertiesList">刷新属性</el-button>-->
-      <el-button type="primary" :loading="loading" v-if="quotationNo" @click="saveBtnClick">新增</el-button>
-      <el-button type="primary" @click="saveClick" v-if="quotationNo">{{ attributeDialog?'编辑':'保存' }}</el-button>
+      <el-button type="primary" :loading="loading" v-if="quotationNo && !disabled" @click="saveBtnClick">新增</el-button>
+      <el-button type="primary" @click="saveClick" v-if="quotationNo && !disabled">{{ attributeDialog?'编辑':'保存' }}</el-button>
     </div>
     <div class="rq" v-if="attributeDialog">
       <el-table

src/views/modules/quotation/sellForQuotation.vue

@@ -167,7 +167,11 @@
       <el-tab-pane label="审批信息" name="approvalInformation">
         <approval-information ref="approvalTable" v-model:data-list="approvalList" :height="300"></approval-information>
       </el-tab-pane>
-
+      <el-tab-pane label="询价-基本信息" name="request">
+        <price-check-properties ref="tabProperties"
+                                v-model:data-list="priceCheckPropertiesList"
+                                height="35vh"></price-check-properties>
+      </el-tab-pane>
       <el-tab-pane label="报价-附件信息" name="quote_oss">
         <oss-components label="报价单号"
                         :columns="ossColumns"
@@ -424,9 +428,12 @@ import {queryCustomer} from "../../../api/customer/customerInformation";
 import {queryProjectByCustomer} from "../../../api/project/project";
 import ApprovalInformation from "../changeManagement/approvalInformation.vue";
 import OssComponents from "../oss/ossComponents.vue";
+import PriceCheckProperties from "./priceCheckProperties.vue";
+import {getPriceCheckPropertiesList} from "../../../api/quotation/priceCheckProperties";
 
 export default {
   components: {
+    PriceCheckProperties,
     ApprovalInformation,
     OssComponents,
     QuoteDetail,
@@ -876,6 +883,8 @@ export default {
         }
       ],
       detailDialogVisible: false,
+
+      priceCheckPropertiesList:[],
     }
   },
   methods: {
@@ -898,7 +907,6 @@ export default {
 
     // 点击quotation行事件
     rowClickQuotation(row, column, event) {
-      this.getApprovalList()
       if (column.label !== '操作') {
         this.quotationHeader = row;
       }
@@ -1472,7 +1480,26 @@ export default {
       this.insertData.internalInquiryBatchNo = this.insertData.internalInquiryNo.split("-")[0]
       this.detailDialogVisible = true;
       this.insertDiaLogFlag = true;
-    }
+    },
+    getPriceCheckProperties() {
+      if (!this.quotationHeader && !this.quotationHeader.internalInquiryNo){
+        this.priceCheckPropertiesList = []
+        return
+      }
+      let params = {
+        site: this.quotationHeader.site,
+        quotationNo: this.quotationHeader.internalInquiryNo
+      }
+      getPriceCheckPropertiesList(params).then(({data}) => {
+        if (data && data.code === 0) {
+          this.priceCheckPropertiesList = data.rows
+        } else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error) => {
+        this.$message.error(error)
+      })
+    },
   },
   computed: {},
   watch: {
@@ -1495,6 +1522,12 @@ export default {
       if (newVal === false){
         this.detailDialogVisible = false;
       }
+    },
+    quotationHeader(newVal,oldVal){
+      if (newVal){
+        this.getApprovalList()
+        this.getPriceCheckProperties();
+      }
     }
   },
   mounted() {

src/views/modules/sys/dict-data.vue

@@ -343,7 +343,7 @@ export default {
       :total="total"
       layout="total,sizes, prev, pager, next, jumper">
     </el-pagination>
-    <el-dialog :visible.sync="saveDataDialogFlag" @open="openSaveDataDialog" @close="closeSaveDataDialog" width="30%" :title="insertOrUpdate === 0?'新增-字典数据':'修改-字典数据'">
+    <el-dialog :visible.sync="saveDataDialogFlag" :close-on-click-modal="false" @open="openSaveDataDialog" @close="closeSaveDataDialog" width="30%" :title="insertOrUpdate === 0?'新增-字典数据':'修改-字典数据'">
       <el-form ref="saveDataForm" label-position="top" :rules="dictDataRules" :model="saveData" label-width="80px">
         <el-form-item label="字典类型" prop="dictType">
           <el-input disabled v-model="saveData.dictType" clearable/>

src/views/modules/sys/dict.vue

@@ -310,7 +310,7 @@ export default {
                  :total="total"
                  layout="total,sizes, prev, pager, next, jumper">
   </el-pagination>
-  <el-dialog :visible.sync="saveDataDialogFlag" v-drag @close="closeSaveDataDialog" width="30%" :title="insertOrUpdate === 0?'新增-字典类型':'修改-字典类型'">
+  <el-dialog :visible.sync="saveDataDialogFlag"  :close-on-click-modal="false" v-drag @close="closeSaveDataDialog" width="30%" :title="insertOrUpdate === 0?'新增-字典类型':'修改-字典类型'">
     <el-form ref="saveDataForm" label-position="top" :rules="dictTypeRules" :model="saveData" label-width="80px">
       <el-form-item label="字典名称" prop="dictName">
         <el-input v-model="saveData.dictName" clearable/>

src/views/modules/test/requestForTest.vue

@@ -328,10 +328,10 @@
         </el-tabs>
       </div>
       <el-footer style="height:30px;text-align:center;margin-top: 8px">
-        <el-button type="primary" @click="saveData()" v-if="modalData.flag !== '1'">保存</el-button>
+        <el-button type="primary" @click="saveData()" v-if="modalData.flag !== '1' && !detailFlag">保存</el-button>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
-        <el-button v-if="modalData.testStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
-        <el-button v-if="modalData.testStatus === '审批中' && modalData.isReject === 'Y'" type="primary" @click="rejectSubmit">驳回</el-button>
+        <el-button v-if="modalData.testStatus === '审批中' && !detailFlag" type="primary" @click="agreeSubmit">同意</el-button>
+        <el-button v-if="modalData.testStatus === '审批中' && modalData.isReject === 'Y' && !detailFlag" type="primary" @click="rejectSubmit">驳回</el-button>
       </el-footer>
     </el-dialog>