Merge branch 'optionSystem' into allTestUrgent

src/SDrpManagement/ProductGroup/index.vue

@@ -25,6 +25,9 @@
           ></el-input>
         </div>
       </selectPeople>
+      
+      <!--阀门选型-->
+      <selectOption position="单独选型" style="margin-left: 10px" @handleParam="handleOptionParam"  v-if="tool.checkAuth($route.name,'optionSystem')"></selectOption>
     </div>
     <selectClass ref="class" @clickAreaBase="clickAreaBase" @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
     <div class="content" v-if="Object.keys(productGroup).length > 0" style="padding: 0;margin-bottom: 0;height: calc(100vh - 360px)">
@@ -61,6 +64,7 @@
 <script>
 import selectClass from './modules/Select2.vue'
 import selectPeople from './modules/selectPeople'
+import SelectOption from '@/optionSystem/selectOption/add.vue'
 import { log } from '@antv/g2plot/lib/utils';
 export default {
   name: 'productgroup',
@@ -93,10 +97,11 @@ export default {
   },
   provide () {
     return {
-      sys_enterpriseid:() => this.sys_enterpriseid
+      sys_enterpriseid:() => this.sys_enterpriseid,
+      detailData:() => false,
     }
   },
-  components:{selectClass,selectPeople},
+  components:{selectClass,selectPeople,SelectOption},
   computed:{
   },
   watch:{
@@ -106,6 +111,13 @@ export default {
     this.tablecols = this.tool.tabelCol(this.$route.name).productGroupTable.tablecols
   },
   methods: {
+    //处理选型请求参数
+    handleOptionParam (param) {
+      param.content.enterprisename = ''
+      param.content.projectname = ''
+      param.content.sourcetable = ''
+      param.content.source = `单独选型`
+    },
     selectRow (data) {
       this.enterprisename = data.enterprisename
       this.sys_enterpriseid = data.sys_enterpriseid

src/optionSystem/selectOption/components/DieFa.vue

@@ -245,7 +245,7 @@
         <div class="fixed__btn__panel">
             <el-button size="small" @click="close" class="normal-btn-width">取 消</el-button>
             <el-button size="small" @click="guangtouParam.content.where.drivetype == '电动' ? active = 2 : active = 3" type="primary" v-if="active == 4" class="normal-btn-width">上一步</el-button>
-            <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width" v-if="active == 4">确认添加</el-button>
+            <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width" v-if="active == 4">{{ position == '单独选型' ? '保存选型单':'确认添加' }}</el-button>
         </div>
     </div>
   </div>
@@ -402,7 +402,7 @@ export default {
                 this.$api.requested({
                     "id": 2024071916224702,
                     "content": {
-                        "sa_projectid": this.detailData().sa_projectid,
+                        "sa_projectid": this.detailData() ? this.detailData().sa_projectid : 0,
                         "part_itemids": this.resultArr.map(item => {
                             return {
                                 parttype:item.parttype,

src/optionSystem/selectOption/components/setOrder.vue

@@ -11,7 +11,7 @@
                     <div class="descript">
                         <div class="item" v-if="result.主阀.torque"><span style="color: #888888;">料号：</span>{{result.主阀.itemno }}</div>
                         <div class="item" v-if="result.主阀.caliber"><span style="color: #888888;">公称通径：</span>{{result.主阀.caliber }}</div>
-                        <div class="item" v-if="result.主阀.nominalpressure"><span style="color: #888888;">公称压力：</span>{{result.主阀.nominalpressure }}</div>
+                        <div class="item" v-if="result.主阀.nominalpressure"><span style="color: #888888;">公称压力：</span>{{result.主阀.nominalpressure.join(',') }}</div>
                         <div class="item" v-if="result.主阀.stemmaterial"><span style="color: #888888;">阀杆材质：</span>{{result.主阀.stemmaterial }}</div>
                         <div class="item" v-if="result.主阀.mainmaterial"><span style="color: #888888;">主体材质：</span>{{result.主阀.mainmaterial }}</div>
                     </div>