消息提醒

src/HDrpManagement/contractManage/components/submitCheck.vue

@@ -25,60 +25,87 @@ export default {
   },
   methods: {
     submit () {
-      if (this.data.status == '新建') {
-        this.$confirm('确定进行提交操作吗？','提示',{
-          confirmButtonText:'确定',
-          cancelButtonText:'取消'
-        }).then(async () => {
-          let res = await this.$api.requested({
-            "id": 20221121202802,
-            "content": {
-                "sa_contractids": [this.data.sa_contractid]
-            },
-          })
-          this.tool.showMessage(res,() => {
-            this.$emit('onSuccess')
-          })
-        })
-      } else {
-        console.log(this.data,'审核数据')
-        console.log(new Date(this.data.enddate))
-        console.log(new Date())
-        console.log(new Date() > new Date(this.data.enddate))
-        if (new Date() > new Date(this.data.enddate)){
-          this.$confirm('当前合同有效期已过期，是否确定继续审核？','提示',{
-            confirmButtonText:'确定',
-            cancelButtonText:'取消'
-          }).then(async () => {
-            let res = await this.$api.requested({
-              "id": 20221121203102,
-              "content": {
-                "type":1,//0：不通过，1：通过
-                "sa_contractid": this.data.sa_contractid
-              },
+      this.$api.requested({
+        "id": "2024091910001802",
+        "content": {
+          "ownertable": "sa_contract", //sa_project,sa_contract,sa_quotedprice
+          "ownerid": this.$route.query.id
+        },
+      }).then(result => {
+        if (result.code) {
+          if (this.data.status == '新建') {
+            this.$confirm('确定进行提交操作吗？','提示',{
+              confirmButtonText:'确定',
+              cancelButtonText:'取消'
+            }).then(async () => {
+              let res = await this.$api.requested({
+                "id": 20221121202802,
+                "content": {
+                    "sa_contractids": [this.data.sa_contractid]
+                },
+              })
+              this.tool.showMessage(res,() => {
+                this.$emit('onSuccess')
+              })
             })
-            this.tool.showMessage(res,() => {
-              this.$emit('onSuccess')
-            })
-          })
-        }else {
-          this.$confirm('确定进行审核操作吗？','提示',{
+          } else {
+            console.log(this.data,'审核数据')
+            console.log(new Date(this.data.enddate))
+            console.log(new Date())
+            console.log(new Date() > new Date(this.data.enddate))
+            if (new Date() > new Date(this.data.enddate)){
+              this.$confirm('当前合同有效期已过期，是否确定继续审核？','提示',{
+                confirmButtonText:'确定',
+                cancelButtonText:'取消'
+              }).then(async () => {
+                let res = await this.$api.requested({
+                  "id": 20221121203102,
+                  "content": {
+                    "type":1,//0：不通过，1：通过
+                    "sa_contractid": this.data.sa_contractid
+                  },
+                })
+                this.tool.showMessage(res,() => {
+                  this.$emit('onSuccess')
+                })
+              })
+            }else {
+              this.$confirm('确定进行审核操作吗？','提示',{
+                confirmButtonText:'确定',
+                cancelButtonText:'取消'
+              }).then(async () => {
+                let res = await this.$api.requested({
+                  "id": 20221121203102,
+                  "content": {
+                    "type":1,//0：不通过，1：通过
+                    "sa_contractid": this.data.sa_contractid
+                  },
+                })
+                this.tool.showMessage(res,() => {
+                  this.$emit('onSuccess')
+                })
+              })
+            }
+          }
+        } else {
+          this.$confirm('产品中存在未通过的成品配置，是否立即提醒产品经理评审？','提示',{
             confirmButtonText:'确定',
-            cancelButtonText:'取消'
+            cancelButtonText:'取消',
+            type: 'warning'
           }).then(async () => {
             let res = await this.$api.requested({
-              "id": 20221121203102,
+              "id": 2024091910214302,
               "content": {
-                "type":1,//0：不通过，1：通过
-                "sa_contractid": this.data.sa_contractid
+                  "ownertable": 'sa_contract',
+                  "ownerid": this.$route.query.id
               },
             })
             this.tool.showMessage(res,() => {
-              this.$emit('onSuccess')
             })
           })
         }
-      }
+      })
+      
     },
   },
 };

src/SDrpManagement/QuotedPrice/detail/components/submitTo.vue

@@ -10,18 +10,44 @@ export default {
   props:["sa_quotedpriceid","disabled"],
   methods:{
     onShow(){
-      this.$confirm('确定提交该报价单吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.CheckRow()
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消提交'
-        });
-      });
+      this.$api.requested({
+        "id": "2024091910001802",
+        "content": {
+          "ownertable": "sa_quotedprice", //sa_project,sa_contract,sa_quotedprice
+          "ownerid": this.$route.query.id
+        },
+      }).then(result => {
+        if (result.code) {
+          this.$confirm('确定提交该报价单吗？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.CheckRow()
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '取消提交'
+            });
+          });
+        } else {
+          this.$confirm('产品中存在未通过的成品配置，是否立即提醒产品经理评审？','提示',{
+            confirmButtonText:'确定',
+            cancelButtonText:'取消',
+            type: 'warning'
+          }).then(async () => {
+            let res = await this.$api.requested({
+              "id": 2024091910214302,
+              "content": {
+                  "ownertable": 'sa_quotedprice',
+                  "ownerid": this.$route.query.id
+              },
+            })
+            this.tool.showMessage(res,() => {
+            })
+          })
+        }
+      })
     },
     async CheckRow(){
       console.log("报价单id"+this.sa_quotedpriceid)

src/optionSystem/optionOrder/detail/index.vue

@@ -27,8 +27,20 @@
             @onSuccess="queryMainData()"
             v-if="mainData.status == '待评审' && tool.checkAuth($route.name,'check')"
           />
+
+          <customBtn
+            class="inline-16"
+            btnName="评审通过"
+            message="确定当前选型单评审通过吗?"
+            idName="2024071815111102"
+            keyName="sa_lectotypecfgids"
+            :id="[$route.query.id]"
+            :paramData="[{key:'status',value:'评审通过-暂无成品'},{key:'refusetype',value:''},{key:'refuseinfo',value:''}]"
+            @onSuccess="queryMainData()"
+            v-if="mainData.status == '评审中' && tool.checkAuth($route.name,'check')"
+          />
           
-          <el-button  size="mini" type="primary" @click="rejectVisible=true" v-if="mainData.status != '无需评审'&&mainData.status != '评审拒绝'&&mainData.status != '评审通过'" class="inline-16">拒绝评审</el-button>
+          <el-button  size="mini" type="primary" @click="rejectVisible=true" v-if="mainData.status != '无需评审'&&mainData.status != '评审拒绝'&&mainData.status != '评审通过'&&mainData.status != '评审通过-已有成品'&&mainData.status != '评审通过-暂无成品'" class="inline-16">拒绝评审</el-button>
           <el-dialog title="评审拒绝" :visible.sync="rejectVisible" width="650px" append-to-body :show-close="false">
             <el-row :gutter="20">
               <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
@@ -144,6 +156,12 @@
                 case '无需评审':
                   style = {color:"rgb(82, 196, 26)"}
                   break;
+                case '评审通过-已有成品':
+                  style = {color:"rgb(82, 196, 26)"}
+                  break;
+                case '评审通过-暂无成品':
+                  style = {color:"rgb(82, 196, 26)"}
+                  break;
                 case '待评审':
                   style = {color:"#3874f6"}
                   break;

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

@@ -26,14 +26,16 @@
                     <span>{{ resultArr[1] && resultArr[1].model }} {{resultArr.length == 3 ? ` + 减速箱：${resultArr[2] && resultArr[2].itemname}` : '' }}</span>
                 </div>
                 <div class="descript">
+                    <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorname"><span style="color: #888888;">执行器名称：</span>{{resultArr[1].actuatorname }}</div>
+                    <div class="item" v-if="resultArr.length >= 2 && resultArr[1].bodystructure"><span style="color: #888888;">执行器结构：</span>{{resultArr[1].bodystructure }}</div>
                     <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].speed"><span style="color: #888888;">转速：</span>{{resultArr[1].speed }}(rpm)</div>
-                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].handwheelratio"><span style="color: #888888;">减速比：</span>{{resultArr[1].ratio }}</div>
-                            <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 && resultArr[1].actuatorsignal.length"><span style="color: #888888;">信号类型：</span>{{resultArr[1].actuatorsignal.join(',') }}</div>
+                    <div class="item" v-if="resultArr.length >= 2 && resultArr[1].speed"><span style="color: #888888;">转速：</span>{{resultArr[1].speed }}(rpm)</div>
+                    <div class="item" v-if="resultArr.length >= 2 && resultArr[1].handwheelratio"><span style="color: #888888;">减速比：</span>{{resultArr[1].ratio }}</div>
+                    <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 && resultArr[1].actuatorsignal.length"><span style="color: #888888;">信号类型：</span>{{resultArr[1].actuatorsignal.join(',') }}</div>
                 </div>
             </td>
         </tr>

src/optionSystem/optionOrder/index.vue

@@ -28,6 +28,8 @@
           <el-option label="待评审" value="待评审"></el-option>
           <el-option label="评审中" value="评审中"></el-option>
           <el-option label="评审拒绝" value="评审拒绝"></el-option>
+          <el-option label="评审通过-暂无成品" value="评审通过-暂无成品"></el-option>
+          <el-option label="评审通过-已有成品" value="评审通过-已有成品"></el-option>
         </el-select>
       </div>
       <div class="mt-10" style="margin-right:10px">
@@ -50,7 +52,7 @@
         :style="
           scope.data.column.data.status === '评审中'
             ? 'color:#000000'
-            : scope.data.column.data.status === '无需评审' || scope.data.column.data.status == '评审通过'
+            : scope.data.column.data.status === '无需评审' || scope.data.column.data.status == '评审通过' || scope.data.column.data.status == '评审通过-暂无成品' || scope.data.column.data.status == '评审通过-已有成品'
               ? 'color:rgb(82, 196, 26)'
               : scope.data.column.data.status === '待评审'
                 ? 'color:#3874f6' : 'color:red'

src/optionSystem/selectOption/components/DieFa.vue

@@ -174,7 +174,6 @@
                         </div>
                         <div class="descript">
                             <div class="item" v-if="resultArr.length && resultArr[0].itemno"><span style="color: #888888;">料号：</span>{{resultArr[0].itemno }}</div>
-                            <div class="item" v-if="resultArr.length && resultArr[0].flh"><span style="color: #888888;">法兰号：</span>{{resultArr[0].flh }}</div>
                             <div class="item" v-if="resultArr.length && resultArr[0].caliber"><span style="color: #888888;">公称通径：</span>{{resultArr[0].caliber }}</div>
                             <div class="item" v-if="resultArr.length && resultArr[0].nominalpressure"><span style="color: #888888;">公称压力：</span>{{resultArr[0].nominalpressure.join(',') }}</div>
                             <div class="item" v-if="resultArr.length && resultArr[0].stemmaterial"><span style="color: #888888;">阀杆材质：</span>{{resultArr[0].stemmaterial }}</div>
@@ -190,6 +189,8 @@
                             <span style="margin-bottom: 8px;">{{ resultArr[1] && resultArr[1].actuatormodel }} {{guangtouParam.content.where.drivetype == '电动' && resultArr[1] && resultArr[1].gearboxname ? ` + 减速箱：${resultArr[1] && resultArr[1].gearboxname}` : '' }}</span>
                         </div>
                         <div class="descript">
+                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorname"><span style="color: #888888;">执行器名称：</span>{{resultArr[1].actuatorname }}</div>
+                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].bodystructure"><span style="color: #888888;">执行器结构：</span>{{resultArr[1].bodystructure }}</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].speed"><span style="color: #888888;">转速：</span>{{resultArr[1].speed }}(rpm)</div>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].handwheelratio"><span style="color: #888888;">减速比：</span>{{resultArr[1].ratio }}</div>
@@ -775,9 +776,6 @@ export default {
         color:#3874F6 !important;
         font-weight: bold;
     }
-    /deep/.fixed__btn__panel {
-        padding-left: 240px !important;
-    }
     .scroll {
         height: calc(100vh - 60px);
         overflow-y: scroll;

src/optionSystem/selectOption/components/setOrder.vue

@@ -28,6 +28,8 @@
                     </div>
                     <div v-if="result.执行器" class="text1" style="margin-bottom: 8px;"></div>
                     <div class="descript" v-if="result.执行器">
+                        <div class="item" v-if="result.执行器.actuatorname"><span style="color: #888888;">执行器名称：</span>{{result.执行器.actuatorname }}</div>
+                        <div class="item" v-if="result.执行器.bodystructure"><span style="color: #888888;">执行器结构：</span>{{result.执行器.bodystructure }}</div>
                         <div class="item" v-if="result.执行器.torque"><span style="color: #888888;">输出扭矩：</span>{{result.执行器.torque }}(Nm)</div>
                         <div class="item" v-if="result.执行器.speed"><span style="color: #888888;">转速：</span>{{result.执行器.speed }}(rpm)</div>
                         <div class="item" v-if="result.执行器.handwheelratio"><span style="color: #888888;">减速比：</span>{{result.执行器.ratio }}</div>
@@ -39,7 +41,7 @@
                     </div>
                 </td>
             </tr>
-            <tr>
+            <tr v-if="result.辅件.length">
                 <td class="title">辅件</td>
                 <td style="padding: 0;">
                     <tr style="border-bottom: 1px solid #DDDDDD;" class="custom-table">

src/optionSystem/valveOption/DieFa.vue

@@ -290,6 +290,8 @@
                             <span style="margin-bottom: 8px;">{{ resultArr[1] && resultArr[1].actuatormodel }} {{guangtouParam.content.where.drivetype == '电动' && resultArr[1] && resultArr[1].gearboxname ? ` + 减速箱：${resultArr[1] && resultArr[1].gearboxname}` : '' }}</span>
                         </div>
                         <div class="descript">
+                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorname"><span style="color: #888888;">执行器名称：</span>{{resultArr[1].actuatorname }}</div>
+                            <div class="item" v-if="resultArr.length >= 2 && resultArr[1].bodystructure"><span style="color: #888888;">执行器结构：</span>{{resultArr[1].bodystructure }}</div>
                             <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>
                             <div class="item" v-if="resultArr.length >= 2 && resultArr[1].speed"><span style="color: #888888;">转速：</span>{{resultArr[1].speed }}(rpm)</div>

vue.config.js

@@ -14,7 +14,7 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          target: 'http://61.164.207.46:8001',  // target host*/
+          target: 'http://61.164.207.46:8000',  // target host*/
           // target: 'http://192.168.3.13:8080',  // target host*!
           // target: 'http://192.168.3.9:8090',  // target host*!
           // target: 'https://oms.idcgroup.com.cn:8079/',  // target host