2024-04-30 更新

2 years ago · 48179370c0
7 changed files with 90 additions and 85 deletions
--- a/src/api/changeManagement/changeManagement.js
+++ b/src/api/changeManagement/changeManagement.js
@ -193,6 +193,13 @@ export const issueChange = data => createAPI(`/plm/changeManagement/issueChange`
 */
 export const submitChange = data => createAPI(`/plm/changeManagement/submitChange`,'post',data)

+/**
+ * 获取节点权限
+ * @param data
+ * @returns {*}
+ */
+export const getNodeAuthority = data => createAPI(`/plm/changeManagement/getNodeAuthority`,'post',data)
+



--- a/src/views/modules/changeManagement/changeRecord.vue
+++ b/src/views/modules/changeManagement/changeRecord.vue
@ -262,7 +262,7 @@
          <el-footer style="height:25px;text-align:center">
            <el-button type="primary" @click="saveData">保存</el-button>
            <el-button type="primary" @click="modalFlag = false">关闭</el-button>
-            <el-button type="primary" @click="submitDataModal">提交</el-button>
+            <el-button v-if="this.modalData.changeStatus === '审批中'" type="primary" @click="submitDataModal">提交</el-button>
          </el-footer>
        </el-tab-pane>

@ -351,6 +351,7 @@
          <el-footer style="height:25px;text-align:center">
            <el-button type="primary" @click="inventoryCostImpactSave">保存</el-button>
            <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+            <el-button v-if="this.modalData.changeStatus === '审批中'" type="primary" @click="submitDataModal">提交</el-button>
          </el-footer>
        </el-tab-pane>

@ -501,6 +502,7 @@
          <el-footer style="height:25px;text-align:center">
            <el-button type="primary" @click="executionInformationSave">保存</el-button>
            <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+            <el-button v-if="this.modalData.changeStatus === '审批中'" type="primary" @click="submitDataModal">提交</el-button>
          </el-footer>
        </el-tab-pane>

@ -553,6 +555,7 @@
          <el-footer style="height:25px;text-align:center">
            <el-button type="primary" @click="countersignatureSave">保存</el-button>
            <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+            <el-button v-if="this.modalData.changeStatus === '审批中'" type="primary" @click="submitDataModal">提交</el-button>
          </el-footer>
        </el-tab-pane>
      </el-tabs>
@ -848,6 +851,7 @@
    countersignatureUpdate, // 编辑会签信息
    issueChange, // 下达
    submitChange, // 提交
+    getNodeAuthority, // 获取节点权限
  } from '@/api/changeManagement/changeManagement.js'
  import ChooseList from '@/views/modules/common/Chooselist'
  import changeUploadFile from "../base/upload_file.vue";
@ -932,6 +936,7 @@
        tempPartRow: {},
        tempExecutorRow: {},
        changeTitle: '',
+        nodeAuthorityArr: '',
        // ======== 数据对象 ========
        modalData: {
          site: this.$store.state.user.site,
@ -1718,9 +1723,18 @@
    },

    methods: {
-      // 获取流程的配置权限
-      getNodeAuthority () {

+      // 获取流程的配置权限
+      getNodeAuthority (changeNo) {
+        let tempData = {
+          site: this.$store.state.user.site,
+          changeNo: changeNo
+        }
+        getNodeAuthority(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.nodeAuthorityArr = data.rows
+          }
+        })
      },

      // ======= 正则校验 =======
@ -2079,6 +2093,9 @@

      // 修改变更单模态框
      updateModal (row) {
+        if (row.changeStatus !== '草稿') {
+          this.getNodeAuthority(row.changeNo)
+        }
        this.modalData = {
          site: row.site,
          changeNo: row.changeNo,
--- a/src/views/modules/changeManagement/changeRequest.vue
+++ b/src/views/modules/changeManagement/changeRequest.vue
@ -55,7 +55,6 @@
        type="selection"
        header-align="center"
        align="center"
-        :selectable="selectFlag"
        width="50">
      </el-table-column>
      <el-table-column
@ -119,7 +118,7 @@
              <el-form-item label="ECN变更影响" prop="changeImpact" :rules="rules.changeImpact">
                <dict-data-select v-if="modalFlag" v-model="modalData.changeImpact" style="width: 205px" dict-type="change_change_Impact"></dict-data-select>
              </el-form-item>
-              <el-form-item label="变更影响描述" prop="changeImpactDesc" :rules="[{required: modalData.changeImpact === 'Y',message: ' ',trigger: ['blur','change']}]">
+              <el-form-item label="变更影响描述" prop="changeImpactDesc" :rules="[{required: modalData.changeImpact === 'Yes',message: ' ',trigger: ['blur','change']}]">
                <el-input v-model="modalData.changeImpactDesc" style="width: 423px"></el-input>
              </el-form-item>
            </el-form>
@ -372,7 +371,7 @@

        <el-tab-pane label="TP&执行信息" name="actionInformation">
          <div style="height: 670px">
-            <el-button type="primary" @click="chooseFeasibilityAssessmentModel">选择评估模板</el-button>
+            <el-button type="primary" @click="chooseFeasibilityAssessmentModel">选择评估信息</el-button>
            <div class="rq">
              <el-table
                :data="chooseItemList2"
@ -394,18 +393,18 @@
                    <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
                  </template>
                </el-table-column>
-                <el-table-column
-                  prop=""
-                  header-align="center"
-                  align="center"
-                  min-width="80"
-                  label="可选值">
-                  <template slot-scope="scope">
-                    <el-select v-model="scope.row.chooseValue" placeholder="请选择">
-                      <el-option v-for="item in scope.row.availableValueList" :key="index" :label="item.availableValue" :value="item.availableValue"></el-option>
-                    </el-select>
-                  </template>
-                </el-table-column>
+<!--                <el-table-column-->
+<!--                  prop=""-->
+<!--                  header-align="center"-->
+<!--                  align="center"-->
+<!--                  min-width="80"-->
+<!--                  label="可选值">-->
+<!--                  <template slot-scope="scope">-->
+<!--                    <el-select v-model="scope.row.chooseValue" placeholder="请选择">-->
+<!--                      <el-option v-for="item in scope.row.availableValueList" :key="index" :label="item.availableValue" :value="item.availableValue"></el-option>-->
+<!--                    </el-select>-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
                <el-table-column
                  prop=""
                  header-align="center"
@ -459,7 +458,7 @@
            <div style="text-align: center ;font-size: 11px">
              <span> --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- </span>
            </div>
-            <el-button type="primary" @click="chooseModel">选择执行模板</el-button>
+            <el-button type="primary" @click="chooseModel">选择执行信息</el-button>
            <div class="rq">
              <el-table
                :data="chooseItemList"
@ -1886,7 +1885,7 @@
              applicationDepartmentId: '',
              applicationDepartmentName: '',
              applyDate: new Date(+ new Date() + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, ''),
-              changeImpact: 'N',
+              changeImpact: '',
              changeImpactDesc: '',
              ecnStage: '',
              changeType: '',
@ -2021,7 +2020,7 @@
          this.$message.warning('请选择ECN变更影响！')
          return
        }
-        if ((this.modalData.changeImpactDesc === '' || this.modalData.changeImpactDesc == null) && this.modalData.changeImpact === 'Y') {
+        if ((this.modalData.changeImpactDesc === '' || this.modalData.changeImpactDesc == null) && this.modalData.changeImpact === 'Yes') {
          this.$message.warning('请填写变更影响描述！')
          return
        }
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@ -167,7 +167,7 @@
              <el-button v-if="modalData.flag === '2'" type="primary" @click="copyBomAlternative()">Copy</el-button>
              <el-button v-if="detailData.status === 'Tentative' || detailData.status === 'Obsolete'" type="primary" @click="updateStatusToBuildable">Build</el-button>
              <el-button v-if="detailData.status === 'Buildable' && (modalData.effPhaseOutDate == null || modalData.effPhaseOutDate === '')" type="primary" @click="updateStatusToObsolete">Retire</el-button>
-              <el-button v-if="modalData.flag === '2' && detailData.officialFlag !== 'Y'" type="primary" @click="toBecomeOfficialBom">转正式BOM</el-button>
+<!--              <el-button v-if="modalData.flag === '2' && modalData.offFlag === 'Y' && detailData.officialFlag === 'Y'" type="primary" @click="toBecomeOfficialBom">转正式BOM</el-button>-->
            </el-form-item>
          </el-form>
          <el-form :inline="true" label-position="top" :model="detailData" :rules="rules" style="margin-left: 7px">
@ -2587,7 +2587,8 @@ export default {
        updateBy: this.$store.state.user.name,
        printUnit: row.printUnit,
        printUnitName: row.printUnitName,
-        officialFlag: row.officialFlag
+        officialFlag: row.officialFlag,
+        offFlag: row.offFlag
      }
      this.subDetailTable = 'bom_sub_detail'
      // 查bom明细
--- a/src/views/modules/part/partInformation.vue
+++ b/src/views/modules/part/partInformation.vue
@ -3260,9 +3260,16 @@
          if (data && data.code === 0) {
            this.getPartItem()
            this.attributeDialog = true
-            this.$message.success(data.msg)
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
          } else {
-            this.$message.warning(data.msg)
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
          }
          this.loading = false
        }).catch((error) => {
@ -3837,7 +3844,7 @@
      toBecomeOfficialPartModal (row) {
        this.modalData = {
          flag: '3',
-          title: '物料投产',
+          title: '物料转正',
          site: row.site,
          partNo: row.partNo,
          partDesc: row.partDesc,
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@ -158,7 +158,7 @@
              <el-button v-if="modalData.flag === '2'" type="primary" @click="copyRoutingAlternative">Copy</el-button>
              <el-button v-if="detailData.status === 'Tentative' || detailData.status === 'Obsolete'" type="primary" @click="updateStatusToBuildable">Build</el-button>
              <el-button v-if="detailData.status === 'Buildable' && (modalData.effPhaseOutDate == null || modalData.effPhaseOutDate === '')" type="primary" @click="updateStatusToObsolete">Retire</el-button>
-              <el-button v-if="modalData.flag === '2' && detailData.officialFlag !== 'Y'" type="primary" @click="toBecomeOfficialRouting">转正式Routing</el-button>
+<!--              <el-button v-if="modalData.flag === '2' && detailData.officialFlag !== 'Y'" type="primary" @click="toBecomeOfficialRouting">转正式Routing</el-button>-->
            </el-form-item>
          </el-form>
          <el-form :inline="true" label-position="top" :model="detailData" :rules="rules" style="margin-left: 7px">
--- a/src/views/modules/project/projectInfo/com_project_info_part.vue
+++ b/src/views/modules/project/projectInfo/com_project_info_part.vue
@ -764,6 +764,22 @@
        dataListLoading: false,
        currentRow:'',
        columnList:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101002001,
+            serialNumber: '101002001Table4finalPartNo',
+            tableId: "101002001Table4",
+            tableName: "项目物料",
+            columnProp: "finalPartNo",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "IFS物料编码",
+            columnHidden: false,
+            columnImage: false,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
          {
            userId: this.$store.state.user.name,
            functionId: 101002001,
@ -776,8 +792,6 @@
            columnLabel: "物料编码",
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
            status: true,
            fixed: '',
            columnWidth: 100
@ -794,8 +808,6 @@
            columnLabel: "物料描述",
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
            status: true,
            fixed: '',
            columnWidth: 120
@ -812,30 +824,10 @@
            columnLabel: "物料状态",
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
            status: true,
            fixed: '',
            columnWidth: 100
          },
-          // {
-          //   userId: this.$store.state.user.name,
-          //   functionId: 101002001,
-          //   serialNumber: '101002001Table4PartType',
-          //   tableId: "101002001Table4",
-          //   tableName: "项目物料",
-          //   columnProp: "partType",
-          //   headerAlign: "center",
-          //   align: "center",
-          //   columnLabel: "物料分类",
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: false,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          //   columnWidth: 60
-          // },
          {
            userId: this.$store.state.user.name,
            functionId: 101002001,
@ -848,8 +840,6 @@
            columnLabel: "物料分类",
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
            status: true,
            fixed: '',
            columnWidth: 80
@ -866,8 +856,6 @@
            columnLabel: "属性模板",
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
            status: true,
            fixed: '',
            columnWidth: 80
@ -884,8 +872,6 @@
            columnLabel: "属性模板名称",
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
            status: true,
            fixed: '',
            columnWidth: 100
@ -902,30 +888,26 @@
            columnLabel: "备注",
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 101002001,
-            serialNumber: '101002001Table4PlmPartNo',
-            tableId: "101002001Table4",
-            tableName: "项目物料",
-            columnProp: "plmPartNo",
-            headerAlign: "center",
-            align: "center",
-            columnLabel: "PLM料号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
            status: true,
            fixed: '',
            columnWidth: 120
          },
+          // {
+          //   userId: this.$store.state.user.name,
+          //   functionId: 101002001,
+          //   serialNumber: '101002001Table4PlmPartNo',
+          //   tableId: "101002001Table4",
+          //   tableName: "项目物料",
+          //   columnProp: "plmPartNo",
+          //   headerAlign: "center",
+          //   align: "center",
+          //   columnLabel: "PLM料号",
+          //   columnHidden: false,
+          //   columnImage: false,
+          //   status: true,
+          //   fixed: '',
+          //   columnWidth: 120
+          // },
          {
            userId: this.$store.state.user.name,
            functionId: 101002001,
@ -938,8 +920,6 @@
            columnLabel: "创建时间",
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
            status: true,
            fixed: '',
            columnWidth: 120
@ -956,8 +936,6 @@
            columnLabel: "创建人",
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
            status: true,
            fixed: '',
            columnWidth: 80
@ -974,8 +952,6 @@
            columnLabel: "上次修改日期",
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
            status: true,
            fixed: '',
            columnWidth: 120
@ -992,8 +968,6 @@
            columnLabel: "修改人",
            columnHidden: false,
            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
            status: true,
            fixed: '',
            columnWidth: 80