Merge branch 'redUrgent' into allTestUrgent

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

@@ -33,7 +33,7 @@
 <script>
 export default {
   name: "examineTo",
-  props: ["sa_quotedpriceid", "disabled"],
+  props: ["sa_quotedpriceid", "disabled","data"],
   data() {
     return {
       draw: false,
@@ -59,23 +59,44 @@ export default {
         ],
       },
       formLabelWidth: "120px",
+      siteid:JSON.parse(window.sessionStorage.getItem('active_account')).siteid,
     };
   },
   methods: {
     async CheckRow() {
       console.log("报价单id" + this.sa_quotedpriceid);
-      const res = await this.$api.requested({
-        id: 20221020165403,
-        version: 1,
-        content: {
-          sa_quotedpriceid: this.sa_quotedpriceid,
-          ischeck: true,
-        },
-      });
-      this.tool.showMessage(res, () => {
-        console.log(res);
-        this.$emit("onExamine");
-      });
+      if (this.data.specialoffer == 1 && this.data.quotedpricerecheck == 1 && this.siteid == 'HY'){
+        const res = await this.$api.requested({
+          "id": 2025110509412902,
+          "content": {
+            "sa_quotedpriceid": this.$route.query.id,
+            "type":'pc'
+          },
+        })
+        this.url = res.data
+        if (this.url){
+          /*this.drawer = true*/
+          window.open(this.url)
+        }else {
+          this.$message({
+            message: this.$t('无权限操作'),
+            type: 'warning'
+          });
+        }
+      }else {
+        const res = await this.$api.requested({
+          id: 20221020165403,
+          version: 1,
+          content: {
+            sa_quotedpriceid: this.sa_quotedpriceid,
+            ischeck: true,
+          },
+        });
+        this.tool.showMessage(res, () => {
+          console.log(res);
+          this.$emit("onExamine");
+        });
+      }
     },
     onShow() {
       this.$confirm(this.$t("是否通过该报价单的审核?"), this.$t("提示"), {

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -14,22 +14,30 @@
         :statusCheck="[{key:'status',value:'审核'},{key:'status',value:'提交'}]"
         :tags="[]"
         :attachmentDisabled="mainData.status == '提交' || mainData.status == '审核' || mainData.status == '复核'"
-        :tabs="['产品明细折扣','产品类别折扣','详细信息','其他费用','历史报价']"
+        :tabs="tool.checkAuth($route.name,'specialProgress') && userInfo.siteid == 'HY'?['产品明细折扣','产品类别折扣','详细信息','特价审批进度','其他费用','历史报价']:['产品明细折扣','产品类别折扣','详细信息','其他费用','历史报价']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="customOperation">
         <!-- 此区域提供了自定义操作按钮 -->
         <submit_to class="inline-16" v-if="tool.checkAuth($route.name,'submit') && mainData.status === '新建'" :disabled="disabledFlag.disabled" :sa_quotedpriceid="mainData.sa_quotedpriceid" @onSubmit="onSuccess"></submit_to>
         <revoke class="inline-16" v-if="tool.checkAuth($route.name,'revoke') && mainData.status === '提交'" :disabled="disabledFlag.disabled" :sa_quotedpriceid="mainData.sa_quotedpriceid" @onRevoke="onSuccess"></revoke>
-        <examine_to class="inline-16" v-if="tool.checkAuth($route.name,'toExamine') && mainData.status === '复核' && mainData.specialoffer == '1' && quotedpricerecheck == '1'" :disabled="disabledFlag.disabled"
-                    :sa_quotedpriceid="mainData.sa_quotedpriceid" @onExamine="onSuccess"></examine_to>
-        <examine_to class="inline-16" v-if="tool.checkAuth($route.name,'toExamine') && mainData.status === '提交' && mainData.specialoffer != '1' && quotedpricerecheck == '1'" :disabled="disabledFlag.disabled"
-                    :sa_quotedpriceid="mainData.sa_quotedpriceid" @onExamine="onSuccess"></examine_to>
-        <examine_to class="inline-16" v-if="tool.checkAuth($route.name,'toExamine') && mainData.status === '提交'  && quotedpricerecheck != '1'" :disabled="disabledFlag.disabled"
-                    :sa_quotedpriceid="mainData.sa_quotedpriceid" @onExamine="onSuccess"></examine_to>
+        <div v-if="userInfo.siteid == 'HY'" style="display: inline-block !important">
+          <examine_to class="inline-16" v-if="tool.checkAuth($route.name,'toExamine') && mainData.status === '提交'" :data="mainData"  :disabled="disabledFlag.disabled"
+                      :sa_quotedpriceid="mainData.sa_quotedpriceid" @onExamine="onSuccess"></examine_to>
+        </div>
+        <div v-else style="display: inline-block !important">
+          <examine_to class="inline-16" v-if="tool.checkAuth($route.name,'toExamine') && mainData.status === '复核' && mainData.specialoffer == '1' && quotedpricerecheck == '1'" :disabled="disabledFlag.disabled" :data="mainData"
+                      :sa_quotedpriceid="mainData.sa_quotedpriceid" @onExamine="onSuccess"></examine_to>
+          <examine_to class="inline-16" v-if="tool.checkAuth($route.name,'toExamine') && mainData.status === '提交' && mainData.specialoffer != '1' && quotedpricerecheck == '1'" :disabled="disabledFlag.disabled" :data="mainData"
+                      :sa_quotedpriceid="mainData.sa_quotedpriceid" @onExamine="onSuccess"></examine_to>
+          <examine_to class="inline-16" v-if="tool.checkAuth($route.name,'toExamine') && mainData.status === '提交'  && quotedpricerecheck != '1'" :disabled="disabledFlag.disabled" :data="mainData"
+                      :sa_quotedpriceid="mainData.sa_quotedpriceid" @onExamine="onSuccess"></examine_to>
+        </div>
         <deApprove class="inline-16" v-if="tool.checkAuth($route.name,'deApprove') && mainData.status === '审核'" :disabled="disabledFlag.disabled" :data="mainData" @onDeApprove="onSuccess"></deApprove>
-        <check class="inline-16" v-if="tool.checkAuth($route.name,'check') && mainData.specialoffer == '1' &&  mainData.status === '提交' && quotedpricerecheck == '1'" :status="mainData.status" :quotedpricerecheck="quotedpricerecheck" @onCheck="onSuccess"></check>
-        <recheck class="inline-16" v-if="tool.checkAuth($route.name,'recheck') && mainData.specialoffer == '1' && mainData.status === '复核' && quotedpricerecheck == '1'"  :status="mainData.status" :quotedpricerecheck="quotedpricerecheck" @onReCheck="onSuccess"></recheck>
+        <div v-if="userInfo.siteid != 'HY'" style="display: inline-block !important">
+          <check class="inline-16" v-if="tool.checkAuth($route.name,'check') && mainData.specialoffer == '1' &&  mainData.status === '提交' && quotedpricerecheck == '1'" :status="mainData.status" :quotedpricerecheck="quotedpricerecheck" @onCheck="onSuccess"></check>
+          <recheck class="inline-16" v-if="tool.checkAuth($route.name,'recheck') && mainData.specialoffer == '1' && mainData.status === '复核' && quotedpricerecheck == '1'"  :status="mainData.status" :quotedpricerecheck="quotedpricerecheck" @onReCheck="onSuccess"></recheck>
+        </div>
         <copyTo class="inline-16" v-if="tool.checkAuth($route.name,'copyTo') " :data="mainData.sa_quotedpriceid" :disabled="disabledFlag.disabled"></copyTo>
         <toVoid class="inline-16" v-if="tool.checkAuth($route.name,'toVoid') && mainData.status === '新建'" :disabled="disabledFlag.disabled" :data="mainData.sa_quotedpriceid" ></toVoid>
       </div>
@@ -65,9 +73,14 @@
         </productInventory>
       </div>
       <div slot="slot3" class=" normal-panel">
-        <otherExpenses :status="mainData.status" :data="mainData" v-if="flag"></otherExpenses>
+        <specialProgress ref="specialProgressRef" v-if="tool.checkAuth($route.name,'specialProgress') && userInfo.siteid == 'HY'"></specialProgress>
+        <otherExpenses :status="mainData.status" :data="mainData" v-else></otherExpenses>
       </div>
       <div slot="slot4" class=" normal-panel">
+        <otherExpenses :status="mainData.status" :data="mainData" v-if="tool.checkAuth($route.name,'specialProgress') && userInfo.siteid == 'HY'"></otherExpenses>
+        <historicalQuotation :data="mainData" v-else></historicalQuotation>
+      </div>
+      <div slot="slot5" class=" normal-panel">
         <historicalQuotation :data="mainData" v-if="flag"></historicalQuotation>
       </div>
       <div slot="slot1" class=" normal-panel">
@@ -120,6 +133,7 @@ import otherExpenses from './modules/otherExpenses/index'
 import itemClass from './modules/itemClass/index'
 import check from './components/check'
 import recheck from './components/recheck'
+import specialProgress from './modules/specialProgress/index'
 export default {
   name: "index",
   data(){
@@ -140,7 +154,7 @@ export default {
         "sa_contractid": "",
         "isadd":''
       },
-      quotedpricerecheck:''
+      quotedpricerecheck:'',
     }
   },
   provide () {
@@ -165,7 +179,8 @@ export default {
     otherExpenses,
     itemClass,
     check,
-    recheck
+    recheck,
+    specialProgress
   },
   watch:{
    async mainData(val) {
@@ -357,7 +372,9 @@ export default {
     },
     onSuccess(){
       this.queryMainData(this.$route.query.id)
-
+      if (this.userInfo.siteid == 'HY'){
+        this.$refs.specialProgressRef.listData()
+      }
     },
     /*同步合作协议*/
     async onCooperate(){

src/SDrpManagement/QuotedPrice/detail/modules/specialProgress/index.vue

@@ -0,0 +1,49 @@
+<template>
+  <div>
+    <el-timeline >
+      <el-timeline-item
+          v-for="(activity, index) in list"
+          :key="index"
+          :timestamp="activity.createDate">
+        {{activity.activityName + '--' + activity.createUserName + ':' + activity.actionName }}<br>
+        {{activity.msg?$t('留言')+'：' + activity.msg:$t('留言')+'：' + '-'}}
+      </el-timeline-item>
+    </el-timeline>
+    <el-empty v-if="list.length === 0" :description="$t(`暂无特价审批进度`)" :image-size="40"></el-empty>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "index",
+  data(){
+    return {
+      list:[]
+    }
+  },
+  methods:{
+    async listData(){
+      const res = await this.$api.requested({
+        "id": 2025110509450602,
+        "content": {
+          "sa_quotedpriceid": this.$route.query.id
+        }
+      })
+      res.data.forEach(item=>{
+        var date = new Date(item.createDate);
+        var month = date.getMonth() + 1 <10 ? '0'+(date.getMonth() + 1):(date.getMonth() + 1)
+
+        item.createDate = `${date.getFullYear()}-${month}-${date.getDate() < 10?'0'+date.getDate():date.getDate()} ${date.getHours() < 10?'0'+date.getHours():date.getHours()}:${date.getMinutes()< 10?'0'+date.getMinutes():date.getMinutes()}:${date.getSeconds()< 10?'0'+date.getSeconds():date.getSeconds()}`;
+      })
+      this.list = res.data
+    }
+  },
+  mounted() {
+    this.listData()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>