2024-09-07

src/HDrpManagement/contractManage/modules/detail.vue

@@ -249,6 +249,11 @@ export default {
     importFile,
     copyTo
   },
+  provide () {
+    return {
+      detailData:() => this.mainData,
+    }
+  },
   watch: {
     mainData: {
       async handler (val) {

src/HDrpManagement/projectChange/modules/detail.vue

@@ -220,6 +220,7 @@ export default {
       isLeader:false
     }
   },
+
   watch:{
    async mainData(val) {
      const res = await this.$api.requested({
@@ -270,7 +271,8 @@ export default {
       projectLead:() => this.projectLead,
       projectPanl:() => this.projectPanl,
       detailData:() => this.mainData,
-      projectAddress:() => this.projectAddress
+      projectAddress:() => this.projectAddress,
+      detailData:() => this.mainData,
     }
   },
   methods:{

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -148,6 +148,11 @@ export default {
       quotedpricerecheck:''
     }
   },
+  provide () {
+    return {
+      detailData:() => this.mainData,
+    }
+  },
   components:{
     detailed,
     contacts,

src/optionSystem/optionOrder/detail/modules/setOrder.vue

@@ -17,7 +17,7 @@
         <tr>
             <td class="title">执行器</td>
             <td>
-                <div class="text1" style="margin-bottom: 8px;">{{ resultArr[1] && resultArr[1].model }} {{resultArr.length <= 3 ? ` + 减速箱：${resultArr[2] && resultArr[2].itemname}` : '' }}</div>
+                <div class="text1" style="margin-bottom: 8px;">{{ resultArr[1] && resultArr[1].model }} {{resultArr.length <= 3 && resultArr[2] && resultArr[2].itemname ? ` + 减速箱：${resultArr[2] && resultArr[2].itemname}` : '' }}</div>
                 <div class="descript">
                     <div class="item" v-if="resultArr.length >= 2 && resultArr[1].torque"><span style="color: #888888;">输出扭矩：</span>{{resultArr[1].torque }}(Nm)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].maxruntime"><span style="color: #888888;">开关时间：</span>{{resultArr[1].maxruntime }}(s)</div>
@@ -26,7 +26,6 @@
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].supplyvoltage"><span style="color: #888888;">电压：</span>{{resultArr[1].supplyvoltage }}(V)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].ratedcurrent"><span style="color: #888888;">电流：</span>{{resultArr[1].ratedcurrent }}(A)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].ratedpower"><span style="color: #888888;">功率：</span>{{resultArr[1].ratedpower }}(KW)</div>
-                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].maxruntime"><span style="color: #888888;">开关时间：</span>{{resultArr[1].maxruntime }}(s)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorsignal"><span style="color: #888888;">信号类型：</span>{{resultArr[1].actuatorsignal.join(',') }}</div>
                 </div>
             </td>
@@ -79,6 +78,7 @@ export default {
             this.$api.requested({
                 "id": 2024071916224702,
                 "content": {
+                    "sa_lectotypecfgid": this.$route.query.id,
                     "part_itemids": this.resultArr.map(item => {
                         return {
                             parttype:item.parttype,

src/optionSystem/selectOption/components/DieFa.vue

@@ -170,7 +170,7 @@
                 <tr>
                     <td class="title">执行器</td>
                     <td>
-                        <div class="text1" style="margin-bottom: 8px;">{{ resultArr[1] && resultArr[1].actuatormodel }} {{guangtouParam.content.where.drivetype == '电动' ? ` + 减速箱：${resultArr[1] && resultArr[1].gearboxname}` : '' }}</div>
+                        <div class="text1" style="margin-bottom: 8px;">{{ resultArr[1] && resultArr[1].actuatormodel }} {{guangtouParam.content.where.drivetype == '电动' && resultArr[1] && resultArr[1].gearboxname ? ` + 减速箱：${resultArr[1] && resultArr[1].gearboxname}` : '' }}</div>
                         <div class="descript">
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].torque"><span style="color: #888888;">输出扭矩：</span>{{resultArr[1].torque }}(Nm)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].maxruntime"><span style="color: #888888;">开关时间：</span>{{resultArr[1].maxruntime }}(s)</div>
@@ -179,7 +179,6 @@
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].supplyvoltage"><span style="color: #888888;">电压：</span>{{resultArr[1].supplyvoltage }}(V)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].ratedcurrent"><span style="color: #888888;">电流：</span>{{resultArr[1].ratedcurrent }}(A)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].ratedpower"><span style="color: #888888;">功率：</span>{{resultArr[1].ratedpower }}(KW)</div>
-                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].maxruntime"><span style="color: #888888;">开关时间：</span>{{resultArr[1].maxruntime }}(s)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorsignal"><span style="color: #888888;">信号类型：</span>{{resultArr[1].actuatorsignal.join(',') }}</div>
                             
                         </div>
@@ -230,7 +229,7 @@ import Aside from '@/optionSystem/FProductManage/modules/aside.vue'
 export default {
     props:['position'],
     components:{MySelect,MyTable,SelectBar,Aside},
-    inject:['valvetype'],
+    inject:['valvetype','detailData'],
     data () {
         return {
             items: [
@@ -372,6 +371,7 @@ export default {
                 this.$api.requested({
                     "id": 2024071916224702,
                     "content": {
+                        "sa_projectid": this.detailData().sa_projectid,
                         "part_itemids": this.resultArr.map(item => {
                             return {
                                 parttype:item.parttype,

src/optionSystem/valveOption/DieFa.vue

@@ -269,7 +269,7 @@
                 <tr>
                     <td class="title">执行器</td>
                     <td>
-                        <div class="text1" style="margin-bottom: 8px;">{{ resultArr[1] && resultArr[1].actuatormodel }} {{guangtouParam.content.where.drivetype == '电动' ? ` + 减速箱：${resultArr[1] && resultArr[1].gearboxname}` : '' }}</div>
+                        <div class="text1" style="margin-bottom: 8px;">{{ resultArr[1] && resultArr[1].actuatormodel }} {{guangtouParam.content.where.drivetype == '电动' && resultArr[1] && resultArr[1].gearboxname ? ` + 减速箱：${resultArr[1] && resultArr[1].gearboxname}` : '' }}</div>
                         <div class="descript">
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].torque"><span style="color: #888888;">输出扭矩：</span>{{resultArr[1].torque }}(Nm)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].maxruntime"><span style="color: #888888;">开关时间：</span>{{resultArr[1].maxruntime }}(s)</div>
@@ -278,7 +278,6 @@
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].supplyvoltage"><span style="color: #888888;">电压：</span>{{resultArr[1].supplyvoltage }}(V)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].ratedcurrent"><span style="color: #888888;">电流：</span>{{resultArr[1].ratedcurrent }}(A)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].ratedpower"><span style="color: #888888;">功率：</span>{{resultArr[1].ratedpower }}(KW)</div>
-                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].maxruntime"><span style="color: #888888;">开关时间：</span>{{resultArr[1].maxruntime }}(s)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorsignal"><span style="color: #888888;">信号类型：</span>{{resultArr[1].actuatorsignal.join(',') }}</div>
                         </div>
                     </td>