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

2021-09-14 16:22:39 +08:00
parent c2ef4878e4 4591df4a1a
commit f017ab5501
20 changed files with 188 additions and 27 deletions
@@ -684,12 +684,23 @@
        <ProcessFooter
                :show-save="false"
                show-submit
+                show-transfer
                :submitLoading="isSubmit"
                :saveLoading="saveLoading"
+                @transfer="handleTransfer"
                @save="handleSave"
                @submit="handleSubmit"
        >
        </ProcessFooter>
+
+        <!-- 福田全公司选人解决方案 -->
+        <Role-tree
+                check-box
+                :is-title="drawerTitle"
+                :is-visible.sync="drawerModal"
+                @checkedRole="checkedRole"
+                :nodeList="nodeList"
+        ></Role-tree>
    </div>
 </template>

@@ -697,13 +708,18 @@
    import ProcessHeader from '../../components/ProcessHeader'
    import ProcessFooter from '../../components/ProcessFooter'
    import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+    import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
    import TreeSelect from '@/components/treeSelect/treeSelect.vue';

    export default {
        name: "bzrkStep2",
        data () {
            return {
+              // 调整处理人抽屉状态
+              drawerModal: false,
+              drawerTitle: '',
+              nodeList: [],
+              selectPeople:'',
              xgdFileId: '',
              fbgbjbdFileId: '',
              bpgFileId: '',
@@ -877,6 +893,26 @@
        },
      },
        methods: {
+            checkedRole (data) {
+                this.assigneeNewLoading = 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 => {
+                    this.assigneeNewLoading = false
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.queryProcess()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
          downloadFile (fileType) {
            //文件id中出现了','字符,去除掉
            if(fileType === 'fbgbjbd'){
@@ -1032,6 +1068,10 @@
            handleTabs(name) {
                this.active = name
            },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
            handleSave() {},
            handleSubmit() {
              const val= this.form.country;
@@ -665,10 +665,19 @@
        show-submit
        :submitLoading="isSubmit"
        :saveLoading="saveLoading"
+        @transfer="handleTransfer"
        @save="handleSave"
        @submit="handleSubmit"
    >
    </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRole"
+            :nodeList="nodeList"
+    ></Role-tree>
  </div>
 </template>

@@ -677,7 +686,7 @@ import {saveTaskFirst} from "api/process";
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';

 export default {
@@ -835,6 +844,11 @@ export default {
      // 流程路由信息
      prcNum : this.$route.query.prcNum,
      prcName : this.$route.query.prcName,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      drawerTitle: '',
+      nodeList: [],
+      selectPeople:'',
    }
  },
  components: {
@@ -849,6 +863,26 @@ export default {
    },
  },
  methods: {
+    checkedRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.assigneeNewLoading = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.processNum()
+          this.queryProcess()
+          this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
    downloadFile (fileType) {
      if(fileType === 'fbgbjbd'){
        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId.replace(",","");
@@ -991,6 +1025,10 @@ export default {
    handleTabs(name) {
      this.active = name
    },
+    handleTransfer() {
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+    },
    handleSave() {
      this.saveLoading = true
      let _formData = new FormData()
@@ -1041,6 +1041,14 @@
        <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
      </div>
    </el-dialog>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRole"
+            :nodeList="nodeList"
+    ></Role-tree>
  </div>
 </template>

@@ -1049,7 +1057,7 @@ import {saveTaskFirst, queryTaskFirst} from "api/process";
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';

@@ -1283,6 +1291,11 @@ export default {
      // 流程路由信息
      prcNum : this.$route.query.prcNum,
      prcName : this.$route.query.prcName,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      drawerTitle: '',
+      nodeList: [],
+      selectPeople:'',
    }
  },
  computed: {
@@ -1291,6 +1304,26 @@ export default {
    },
  },
  methods: {
+    checkedRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.assigneeNewLoading = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.processNum()
+          this.queryProcess()
+          this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
    getTaskId () {
      queryTaskFirst({
        bpnId: this.$route.query.bpnId
@@ -370,6 +370,8 @@ export default {
  },
  data() {
    return {
+      nodeList:[],
+      drawerTitle:'',
      isTransfer: false,
      // 调整处理人抽屉状态
      drawerModal: false,
@@ -334,6 +334,8 @@ export default {
  },
  data() {
    return {
+      nodeList:[],
+      drawerTitle:'',
      isTransfer: false,
      // 调整处理人抽屉状态
      drawerModal: false,
@@ -333,6 +333,8 @@ export default {
  },
  data() {
    return {
+      nodeList:[],
+      drawerTitle:'',
      isTransfer: false,
      // 调整处理人抽屉状态
      drawerModal: false,
@@ -333,6 +333,8 @@ export default {
  },
  data() {
    return {
+      nodeList:[],
+      drawerTitle:'',
      isTransfer: false,
      // 调整处理人抽屉状态
      drawerModal: false,
@@ -318,6 +318,8 @@ export default {
  },
  data() {
    return {
+      nodeList:[],
+      drawerTitle:'',
      isTransfer: false,
      // 调整处理人抽屉状态
      drawerModal: false,
@@ -316,6 +316,8 @@ export default {
  },
  data() {
    return {
+      nodeList:[],
+      drawerTitle:'',
      isTransfer: false,
      // 调整处理人抽屉状态
      drawerModal: false,
@@ -318,6 +318,8 @@ export default {
  },
  data() {
    return {
+      nodeList:[],
+      drawerTitle:'',
      isTransfer: false,
      // 调整处理人抽屉状态
      drawerModal: false,
@@ -271,6 +271,8 @@ export default {
  },
  data() {
    return {
+      nodeList:[],
+      drawerTitle:'',
      isTransfer: false,
      // 调整处理人抽屉状态
      drawerModal: false,
@@ -473,6 +473,8 @@ export default {
    handleSubmit() {
      this.isSubmit = true;
      this.listForm.commentText = this.commentText;
+      this.listForm.children = this.dataList[0].children
+      this.listForm.dataList = this.dataList
      const json = JSON.stringify(this.listForm);
      this.$http.post("lawss/activiti/completeTask", {
        taskIds: this.taskIds,
@@ -567,14 +569,14 @@ export default {
      } else if (this.type === 2) {
        this.selectList.forEach(item => {
          this.dataList.map(items => {
-            if (item.id == items.id) {
+            if (item.id === items.id) {
              items.workPeople = "";
              items.workPeopleId = "";
              this.$message.warning('您只能针对条款进行分发')
            }
            if (items.children.length) {
              items.children.map(childrenItem => {
-                if (childrenItem.id == item.id) {
+                if (childrenItem.id === item.id) {
                  childrenItem.workPeople = data[0].name;
                  childrenItem.workPeopleId = data[0].id;
                }
@@ -444,6 +444,7 @@ export default {
  },
  data() {
    return {
+      nodeList:[],
      isTransfer: false,
      // 调整处理人抽屉状态
      drawerModal: false,
@@ -318,6 +318,8 @@ export default {
  },
  data() {
    return {
+      nodeList:[],
+      drawerTitle:'',
      isTransfer: false,
      // 调整处理人抽屉状态
      drawerModal: false,
@@ -316,6 +316,8 @@ export default {
  },
  data() {
    return {
+      nodeList:[],
+      drawerTitle:'',
      isTransfer: false,
      // 调整处理人抽屉状态
      drawerModal: false,
@@ -318,6 +318,8 @@ export default {
  },
  data() {
    return {
+      nodeList:[],
+      drawerTitle:'',
      isTransfer: false,
      // 调整处理人抽屉状态
      drawerModal: false,
@@ -128,7 +128,7 @@
                  <i class="iconfont">&#xe61e;</i>
                  <el-dropdown-menu slot="dropdown">
                    <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b9abd00768c8ed97be89547c2da3f0eb'">查看</el-dropdown-item>
-                    <el-dropdown-item :command="[scope.row, '强制撤回']">强制撤回</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '强制撤回']">撤回</el-dropdown-item>
                  </el-dropdown-menu>
                </el-dropdown>
              </div>
@@ -184,11 +184,16 @@
                label="标准号"
            >
              <template slot-scope="scope">
-                <a v-if="scope.row.standYear" class="table-jump"
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                    scope.row.standNumber
                  }}-{{ scope.row.standYear }}</a>
-                <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                    scope.row.standNumber
+                  }}-{{ scope.row.standYear }}</a>
+                <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
+                  {{ scope.row.standSortShow }}
                  {{ scope.row.standNumber }}</a>
              </template>
            </el-table-column>
@@ -197,7 +202,8 @@
                label="标准名称"
            >
              <template slot-scope="scope">
-                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+                <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
              </template>
            </el-table-column>
            <el-table-column
@@ -206,7 +212,8 @@
                width="110px"
                label="发布日期">
              <template slot-scope="scope">
-                {{ formatIssueDate(scope.row.issueTime) }}
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
              </template>
            </el-table-column>
            <el-table-column
@@ -216,7 +223,8 @@
                label="实施日期">
              <template slot-scope="scope">
                <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>

              </template>
            </el-table-column>
@@ -227,7 +235,8 @@
                width="150px"
                label="新车型实施日期">
              <template slot-scope="scope">
-                <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
              </template>
            </el-table-column>
            <el-table-column
@@ -236,7 +245,8 @@
                width="150px"
                label="在产车实施日期">
              <template slot-scope="scope">
-                <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
              </template>
            </el-table-column>
            <el-table-column
@@ -250,7 +260,8 @@
              <!--                </el-tooltip>-->
              <!--              </template>-->
              <template slot-scope="scope">
-                <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
              </template>
            </el-table-column>
            <el-table-column label="操作" align="center" width="50" fixed="right">
@@ -297,7 +297,9 @@
          >
            <template slot-scope="scope">
 <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
            </template>
          </el-table-column>
          <el-table-column
@@ -306,7 +308,9 @@
            label="中文名称"
          >
            <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
            </template>
          </el-table-column>
          <el-table-column
@@ -315,7 +319,9 @@
            label="英文名称"
          >
            <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
            </template>
          </el-table-column>
          <el-table-column
@@ -325,7 +331,9 @@
            width="110"
          >
            <template slot-scope="scope">
-              {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
+              <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
            </template>
          </el-table-column>
          <el-table-column
@@ -335,7 +343,9 @@
            width="110"
          >
            <template slot-scope="scope">
-              {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
+              <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+              <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
            </template>
          </el-table-column>
          <el-table-column
@@ -347,13 +357,13 @@
            >

              <template slot-scope="scope">
-                <span v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '被代替' " style="color: #F56C6C">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
                  {{scope.row.standStatusShow}}
                </span>
-                <span v-else-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">
                  {{scope.row.standStatusShow}}
                </span>
-                <span v-else>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
                  {{scope.row.standStatusShow}}
                </span>
              </template>
@@ -189,7 +189,11 @@
              width="110px"
              label="发布日期">
              <template slot-scope="scope">
-                {{ formatIssueDate(scope.row.issueTime) }}
+                <div>
+                  <a>
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                  </a>
+                </div>
              </template>
            </el-table-column>
            <el-table-column
@@ -199,7 +203,7 @@
                label="实施日期">
              <template slot-scope="scope">
                <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
+                <a>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</a>

              </template>
            </el-table-column>
@@ -209,7 +213,7 @@
                width="150px"
                label="新车型实施日期">
              <template slot-scope="scope">
-                <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
+                <a>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</a>
              </template>
            </el-table-column>
            <el-table-column
@@ -218,7 +222,7 @@
                width="150px"
                label="在产车实施日期">
              <template slot-scope="scope">
-                <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
+                <a>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</a>
              </template>
            </el-table-column>
            <el-table-column
@@ -232,7 +236,7 @@
 <!--                </el-tooltip>-->
 <!--              </template>-->
              <template slot-scope="scope">
-                <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                <a>{{ textStatusMap[scope.row.textStatus] }}</a>
              </template>
            </el-table-column>
            <el-table-column label="操作" align="center" width="50" fixed="right">