Merge remote-tracking branch 'origin/dev_20231113_phonePage' into dev_20231113_phonePage

src/components/hzwlComponents/TimeLineFormItem.vue

@@ -3,7 +3,7 @@
     <el-card>
       <el-form-item :prop="prop" style="margin-bottom: 0">
         <h4>{{ title }}</h4>
-        <div style="margin-top: 10px;width: 300px;">
+        <div style="margin-top: 10px;width: 300px;max-width: 100%">
           <el-input
               :disabled="disabled"
               :value="name"

src/pages/processCenter/pages/phone/qbrk/components/Basic.vue

@@ -0,0 +1,88 @@
+<template>
+  <div class="prc-content-border">
+    <SelectFormItem
+        label="企标类别"
+        title="企标类别"
+        v-model="form.standSort"
+        :options="dict.BUSSSTANDCLASS || []"
+        :disabled="disabled"
+    ></SelectFormItem>
+    <InputFormItem
+        label="中文名称"
+        prop="standName"
+        v-model="form.standName"
+        :disabled="disabled"
+    ></InputFormItem>
+    <SelectFormItem
+        label="制修订类型"
+        title="制修订类型"
+        v-model="form.reviseStatus"
+        :options="reviseStatusOptions"
+        :disabled="disabled"
+    ></SelectFormItem>
+    <InputFormItem
+        label="英文名称"
+        prop="standEnName"
+        v-model="form.standEnName"
+        :disabled="disabled"
+    ></InputFormItem>
+    <DatePickerFormItem
+        label="企标实施日期"
+        prop="putTime"
+        v-model="form.putTime"
+        :disabled="disabled"
+    ></DatePickerFormItem>
+  </div>
+</template>
+
+<script>
+import InputFormItem from '@/components/hzwlComponents/InputFormItem'
+import DatePickerFormItem from '@/components/hzwlComponents/DatePickerFormItem'
+import SelectFormItem from '@/components/hzwlComponents/SelectFormItem'
+
+export default {
+  name: "Basic",
+  props: {
+    form: {
+      type: Object,
+      default: () => {}
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    dict: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  components: {
+    InputFormItem,
+    DatePickerFormItem,
+    SelectFormItem
+  },
+  data () {
+    const reviseStatusOptions = [
+      {
+        label: '制订',
+        value: '1'
+      },
+      {
+        label: '修订',
+        value: '2'
+      },
+      {
+        label: '修改',
+        value: '3'
+      }
+    ]
+    return {
+      reviseStatusOptions
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/pages/processCenter/pages/phone/qbrk/components/Info.vue

@@ -0,0 +1,76 @@
+<template>
+  <div class="prc-content-border">
+    <TextareaFormItem
+        label="代替企标编号"
+        prop="DTQBBHBUSS"
+        v-model="form.DTQBBHBUSS"
+        :disabled="disabled"
+    ></TextareaFormItem>
+    <TextareaFormItem
+        label="采用标准"
+        prop="CYBZ"
+        v-model="form.CYBZ"
+        :disabled="disabled"
+    ></TextareaFormItem>
+    <TextareaFormItem
+        label="引用标准"
+        prop="YYBZ"
+        v-model="form.YYBZ"
+        :disabled="disabled"
+    ></TextareaFormItem>
+    <TextareaFormItem
+        label="上传时间"
+        prop="XCSJBUSS"
+        v-model="form.XCSJBUSS"
+        :disabled="disabled"
+    ></TextareaFormItem>
+    <SelectMultipleFormItem
+        label="采标程度"
+        prop="CYCD"
+        v-model="form.CYCD"
+        :disabled="disabled"
+        :options="dict.DEGREESTANDARD || []"
+    ></SelectMultipleFormItem>
+    <UploadFormItem
+        label="关联文件"
+        prop="GLWJBUSSName"
+        :ids.sync="form.GLWJBUSS"
+        :names.sync="form.GLWJBUSSName"
+        view
+        :disabled="disabled"
+    ></UploadFormItem>
+  </div>
+</template>
+
+<script>
+import TextareaFormItem from '@/components/hzwlComponents/TextareaFormItem'
+import SelectMultipleFormItem from '@/components/hzwlComponents/SelectMultipleFormItem'
+import UploadFormItem from '@/components/hzwlComponents/UploadFormItem'
+
+export default {
+  name: "Info",
+  components: {
+    TextareaFormItem,
+    SelectMultipleFormItem,
+    UploadFormItem
+  },
+  props: {
+    form: {
+      type: Object,
+      default: () => {}
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    dict: {
+      type: Object,
+      default: () => {}
+    }
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/pages/processCenter/pages/phone/qbrk/components/ProcessFile.vue

@@ -0,0 +1,61 @@
+<template>
+  <div class="prc-content-border">
+    <UploadFormItem
+        label="发布稿"
+        prop="FBGBUSSName"
+        :ids.sync="form.FBGBUSS"
+        :names.sync="form.FBGBUSSName"
+        view
+        :disabled="disabled"
+    ></UploadFormItem>
+    <UploadFormItem
+        label="历史版本"
+        prop="LSBBBUSSName"
+        :ids.sync="form.LSBBBUSS"
+        :names.sync="form.LSBBBUSSName"
+        view
+        :disabled="disabled"
+    ></UploadFormItem>
+    <UploadFormItem
+        label="编制说明"
+        prop="BZSMBUSSName"
+        :ids.sync="form.BZSMBUSS"
+        :names.sync="form.BZSMBUSSName"
+        view
+        :disabled="disabled"
+    ></UploadFormItem>
+    <UploadFormItem
+        label="其他文件"
+        prop="QTWJBUSSName"
+        :ids.sync="form.QTWJBUSS"
+        :names.sync="form.QTWJBUSSName"
+        view
+        :disabled="disabled"
+    ></UploadFormItem>
+  </div>
+</template>
+
+<script>
+import UploadFormItem from '@/components/hzwlComponents/UploadFormItem'
+export default {
+  name: "ProcessFile",
+  components: {
+    UploadFormItem
+  },
+  props: {
+    form: {
+      type: Object,
+      default: () => {
+      }
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/pages/processCenter/pages/phone/qbrk/components/Range.vue

@@ -0,0 +1,86 @@
+<template>
+  <div class="prc-content-border">
+    <InputFormItem
+        label="起草部门"
+        prop="QCDW"
+        v-model="form.QCDW"
+        :disabled="disabled"
+    ></InputFormItem>
+    <InputFormItem
+        label="起草人"
+        prop="QCRBUSS"
+        v-model="form.QCRBUSS"
+        :disabled="disabled"
+    ></InputFormItem>
+    <InputFormItem
+      label="文件上传人员"
+      prop="WJSCRYBUSSName"
+      v-model="form.WJSCRYBUSSName"
+      :disabled="disabled"
+    ></InputFormItem>
+    <SelectMultipleFormItem
+        label="适用车型"
+        prop="SYCXCLASS"
+        v-model="form.SYCXCLASS"
+        :disabled="disabled"
+        :options="dict.ENERGYTYPES || []"
+    ></SelectMultipleFormItem>
+    <SelectMultipleFormItem
+        label="能源类型"
+        prop="NYLXCLASS"
+        v-model="form.NYLXCLASS"
+        :disabled="disabled"
+        :options="dict.NYLXCLASS || []"
+    ></SelectMultipleFormItem>
+    <SelectMultipleFormItem
+        label="适用产品线"
+        prop="SYCPXCLASS"
+        v-model="form.SYCPXCLASS"
+        :disabled="disabled"
+        :options="dict.SYCPXCLASS || []"
+    ></SelectMultipleFormItem>
+    <van-field label="关联模块--乘用车VPPS编码" v-model="form.CYCVPPSBMBUSS" readonly   placeholder=""/>
+    <van-field label="关联模块--卡车VPPS编码" v-model="form.KCVPPSBMBUSS" readonly placeholder=""/>
+    <van-field label="关联模块--乘用车vpps中文名称" v-model="form.CYCVPPSCNBUSS" readonly placeholder="" />
+    <van-field label="关联模块--卡车vpps中文名称" v-model="form.KCVPPSCNBUSS" placeholder="" readonly />
+    <TextareaFormItem
+        label="标准体系"
+        prop="TXLBBUSS"
+        v-model="form.TXLBBUSS"
+        :disabled="disabled"
+    ></TextareaFormItem>
+  </div>
+</template>
+
+<script>
+import InputFormItem from '@/components/hzwlComponents/InputFormItem'
+import SelectMultipleFormItem from '@/components/hzwlComponents/SelectMultipleFormItem'
+import TextareaFormItem from '@/components/hzwlComponents/TextareaFormItem'
+
+export default {
+  name: "Range",
+  components: {
+    InputFormItem,
+    SelectMultipleFormItem,
+    TextareaFormItem
+  },
+  props: {
+    form: {
+      type: Object,
+      default: () => {}
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    dict: {
+      type: Object,
+      default: () => {}
+    }
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/pages/processCenter/pages/phone/qbrk/components/RoleInfo.vue

@@ -0,0 +1,138 @@
+<template>
+  <el-timeline style="padding-top: 20px">
+    <el-form
+        ref="userForm"
+        :model="roleForm"
+        class="label-input-form">
+      <TimeLineFormItem
+          prop="prcCreateUserName"
+          timestamp="起草"
+          title="标准起草人"
+          :id.sync="roleForm.prcCreateUser"
+          :name.sync="roleForm.prcCreateUserName"
+          disabled
+      ></TimeLineFormItem>
+      <TimeLineFormItem
+          prop="qcUserName"
+          timestamp="企标编写"
+          title="其他起草人"
+          :id.sync="roleForm.qcUserId"
+          :name.sync="roleForm.qcUserName"
+          disabled
+      ></TimeLineFormItem>
+      <TimeLineFormItem
+          prop="hzUserName"
+          timestamp="企标编写汇总"
+          title="标准起草人"
+          :id.sync="roleForm.hzUserId"
+          :name.sync="roleForm.hzUserName"
+          disabled
+      ></TimeLineFormItem>
+      <TimeLineFormItem
+          prop="bzhUserName"
+          timestamp="标准化初审"
+          title="总院各中心兼职标准化员/各事业部标准化员"
+          :id.sync="roleForm.bzhUserId"
+          :name.sync="roleForm.bzhUserName"
+          disabled
+      ></TimeLineFormItem>
+      <TimeLineFormItem
+          prop="hqUserName"
+          timestamp="征求意见（张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师）"
+          title="张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师"
+          :id.sync="roleForm.hqUserId"
+          :name.sync="roleForm.hqUserName"
+          disabled
+      ></TimeLineFormItem>
+      <TimeLineFormItem
+          prop="xdUserName"
+          timestamp="技术委员会评审、评审意见修改"
+          title="标准起草人"
+          :id.sync="roleForm.xdUserId"
+          :name.sync="roleForm.xdUserName"
+          disabled
+      ></TimeLineFormItem>
+      <TimeLineFormItem
+          prop="fggcsUserName"
+          timestamp="标准化复审"
+          title="标准法规工程师"
+          :id.sync="roleForm.fggcsUserId"
+          :name.sync="roleForm.fggcsUserName"
+          disabled
+      ></TimeLineFormItem>
+      <TimeLineFormItem
+          prop="jsfzrUserName"
+          timestamp="审核"
+          title="起草单位高级经理"
+          :id.sync="roleForm.jsfzrUserId"
+          :name.sync="roleForm.jsfzrUserName"
+          disabled
+      ></TimeLineFormItem>
+      <TimeLineFormItem
+          prop="bzUserName"
+          timestamp="审核"
+          title="标准法规部高级经理"
+          :id.sync="roleForm.bzUserId"
+          :name.sync="roleForm.bzUserName"
+          disabled
+      ></TimeLineFormItem>
+      <TimeLineFormItem
+          prop="fzrUserName"
+          timestamp="审定"
+          title="起草单位中心主任"
+          :id.sync="roleForm.fzrUserId"
+          :name.sync="roleForm.fzrUserName"
+          disabled
+      ></TimeLineFormItem>
+      <TimeLineFormItem
+          prop="zhrUserName"
+          timestamp="批准"
+          title="总院技术委员会覆盖领域企业标准：专委会主任；总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长"
+          :id.sync="roleForm.zhrUserId"
+          :name.sync="roleForm.zhrUserName"
+          disabled
+      ></TimeLineFormItem>
+      <TimeLineFormItem
+          prop="pxUserName"
+          timestamp="培训"
+          title="标准起草人"
+          :id.sync="roleForm.pxUserId"
+          :name.sync="roleForm.pxUserName"
+          disabled
+      ></TimeLineFormItem>
+      <TimeLineFormItem
+          prop="fbUserName"
+          timestamp="发布"
+          title="标准法规工程师"
+          :id.sync="roleForm.fbUserId"
+          :name.sync="roleForm.fbUserName"
+          disabled
+      ></TimeLineFormItem>
+    </el-form>
+  </el-timeline>
+</template>
+
+<script>
+import TimeLineFormItem from '@/components/hzwlComponents/TimeLineFormItem'
+
+export default {
+  name: "RoleInfo",
+  components: {
+    TimeLineFormItem
+  },
+  props: {
+    roleForm: {
+      type: Object,
+      default: () => ({})
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/pages/processCenter/pages/phone/qbrk/step1.vue

@@ -0,0 +1,264 @@
+<template>
+  <div class="phoneBox">
+    <ProcessHeaderPhone toggle>
+      <template slot="proName">企标制修订-技术标准</template>
+      <template slot="proNode">起草</template>
+    </ProcessHeaderPhone>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
+    </div>
+    <div class="content">
+      <el-form
+          v-if="reloadForm"
+          ref="form"
+          :model="form"
+          class="label-input-form phoneForm"
+          label-width="112px"
+      >
+        <template v-if="active === '1'">
+          <div>
+            <ProcessTitle>
+              <template slot="title">基础信息</template>
+            </ProcessTitle>
+            <Basic :form="form" :dict="dict" :disabled="disabled"></Basic>
+            <ProcessTitle>
+              <template slot="title">过程稿件</template>
+            </ProcessTitle>
+            <ProcessFile :form="form" :disabled="disabled"></ProcessFile>
+            <ProcessTitle>
+              <template slot="title">适用范围</template>
+            </ProcessTitle>
+            <Range :form="form" :dict="dict" :disabled="disabled"></Range>
+            <ProcessTitle>
+              <template slot="title">关联信息</template>
+            </ProcessTitle>
+            <Info :form="form" :dict="dict" :disabled="disabled"></Info>
+          </div>
+          <ReceiptDescription v-model="form.commentText" title="回执说明"></ReceiptDescription>
+        </template>
+        <template v-if="active === '2'">
+          <RoleInfo :roleForm="roleForm"></RoleInfo>
+        </template>
+        <template v-if="active === '3'">
+          <PhoneHistortTable :prcNum="this.$route.query.prcNum"></PhoneHistortTable>
+        </template>
+      </el-form>
+    </div>
+    <ProcessFooter
+        show-submit
+        :submitLoading="footerLoading"
+        @submit="handleSubmit"
+        @transfer="handleTransfer"
+    >
+    </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <phoneRoleTree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedRole"
+        :nodeList="nodeList"
+    ></phoneRoleTree>
+  </div>
+</template>
+
+<script>
+import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew} from 'api/process'
+import { selectByIdAtt } from "@/api/flow/index.js"
+
+import ProcessHeaderPhone from '@/pages/processCenter/pages/components/ProcessHeaderPhone'
+import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
+import ProcessFooter from '@/pages/processCenter/pages/components/ProcessFooter'
+import PhoneHistortTable from '@/components/hzwlComponents/phoneComponents/phoneApprovalHistory'
+import ReceiptDescription from "@/components/hzwlComponents/ReceiptDescription";
+import phoneRoleTree from '@/components/hzwlComponents/phoneComponents/phoneRoleTree'
+
+import Basic from "./components/Basic";
+import ProcessFile from "./components/ProcessFile";
+import Range from "./components/Range";
+import Info from "./components/Info";
+import RoleInfo from "./components/RoleInfo";
+
+export default {
+  name: "step1",
+  components: {
+    ProcessHeaderPhone,
+    PhoneHistortTable,
+    ProcessTitle,
+    ProcessFooter,
+    ReceiptDescription,
+    phoneRoleTree,
+    Basic,
+    ProcessFile,
+    Range,
+    Info,
+    RoleInfo
+  },
+  data () {
+    const form = {}
+    return {
+      active: '1',
+      reloadForm: true,
+      form,
+      roleForm: {},
+      dict: {},
+      textStatusMap: [],
+      disabled: true,
+      footerLoading: false,
+
+      // 福田全公司选人解决方案
+      drawerModal: false,
+      drawerTitle: '',
+      nodeList: []
+    }
+  },
+  created() {
+    this.getDicTypeListCode()
+    this.getData()
+  },
+  methods: {
+    handleTabs(name) {
+      this.active = name;
+    },
+    getData () {
+      const { taskIds, prcId } = this.$route.query
+
+      inboundLiaisonDetail({
+        taskIds,
+        pId: prcId
+      }).then(res => {
+        if (res) {
+          this.reloadForm = false
+          const processForm = JSON.parse(res.mesg)
+          this.form = JSON.parse(JSON.stringify(processForm.form || processForm))
+          this.form.commentText = ''
+
+          this.form.standSort = this.form.bussSort
+          this.form.planId = this.form.nowEsId
+          this.form.standName = this.form.renameEs || this.form.esName
+          // 修订: 发布稿放到历史版本
+          if(this.form.reviseStatus === '2'){
+            selectByIdAtt(this.form.rqbJson).then(res =>{
+              if (res && res.data && res.data[0].fbgbuss !== '') {
+                const names = res.data.reduce((init,item,index,arr)=>{
+                  if(index === 0){
+                    init = item.fbgbussNmae
+                  }else{
+                    init = init + ',' + item.fbgbussNmae
+                  }
+                  return init
+                },'')
+                const ids = res.data.reduce((init,item,index,arr)=>{
+                  if(index === 0){
+                    init = item.fbgbuss
+                  }else{
+                    init = init + ',' + item.fbgbuss
+                  }
+                  return init
+                },'')
+                this.reloadForm = false
+
+                if (!this.form.LSBBBUSSName) {
+                  this.form.LSBBBUSSName = names
+                  this.form.LSBBBUSS = ids
+                } else if (this.form.LSBBBUSSName.indexOf(names) === -1) {
+                  this.form.LSBBBUSSName = names + ',' + this.form.LSBBBUSSName
+                  this.form.LSBBBUSS = ids + ',' + this.form.LSBBBUSS
+                }
+
+                this.$nextTick(() => {
+                  this.reloadForm = true
+                })
+              }
+            })
+          }
+
+          this.form.QCDW = this.form.QCDW || this.form.unitName
+          this.form.QCDWID = this.form.QCDWID || this.form.unit
+          this.form.QCRBUSSID = this.form.QCRBUSSID || this.form.drafter
+          this.form.QCRBUSS = this.form.QCRBUSS || this.form.drafterName
+          this.form.SYCXCLASS = this.form.SYCXCLASS && this.form.SYCXCLASS.length > 0 ? this.form.SYCXCLASS : this.form.area
+
+          this.form.DTQBBHBUSS = this.form.DTQBBHBUSS || this.form.rqbName
+          this.form.CYBZ = this.form.CYBZ || this.form.esStandRelations
+          this.form.YYBZ = this.form.YYBZ || this.form.esMatingRelations
+
+          this.roleForm = processForm.roleForm
+          console.log( this.roleForm)
+
+          this.$nextTick(() => {
+            this.reloadForm = true
+          })
+        }
+      })
+    },
+    async handleSubmit () {
+      this.$message({
+        dangerouslyUseHTMLString: true,
+        message: <div style="word-break: keep-all;color: #F56C6C">当前任务不支持手机端处理</div>,
+        type: 'error'
+      })
+    },
+    handleTransfer () {
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+    },
+    // 转办
+    checkedRole (data) {
+      this.footerLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        assignee: data[0].id, // 被委托人
+        pId: this.$route.query.prcId, // 流程实例
+      }).then(res => {
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          setTimeout(() => {
+            this.$router.go(-2)
+          }, 100)
+        } else {
+          this.$message.warning(res.message)
+        }
+      }).finally(() => {
+        this.footerLoading = false
+      })
+    },
+    getDicTypeListCode () {
+      this.$http._getData('sys/dictype/getDicTypeListCode').then(res => {
+        this.dict = { ...res.data }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.phoneBox .content {
+  border-top: 1px solid #DCDFE6;
+  margin-top: 51px;
+  height: calc(100% - 156px);
+
+  background-color: #fff;
+  padding: 0 10px;
+  box-sizing: border-box;
+
+  overflow: auto;
+  .phoneForm {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+}
+.phoneBox /deep/ .van-field__label {
+  width: 112px !important;
+  margin-right: 0 !important;
+  padding-left: 10px !important;
+}
+.phoneBox /deep/ .van-field__control {
+  padding-left: 10px !important;
+}
+</style>

src/router/index.js

@@ -3456,6 +3456,17 @@ const routes = [
           title: '标准入库流程'
         }
       },
+      //  起草(制定/修订)
+      {
+        path: '/phoneQbzxdjhgkStep6',
+        name: 'phoneQbzxdjhgkStep6',
+        component: () => import('@/pages/processCenter/pages/phone/qbrk/step1.vue'),
+        meta: {
+          isBoolean: true,
+          requireAuth: true,
+          title: '企标制修订-技术标准'
+        }
+      },
       {
         path: '/phoneBussLibrary4',
         name: 'phoneBussLibrary4',