文字修复

yangys

2025-09-06 9ac5f1a6b99e8a07ebc4c4be082ced3c219f4e2e

文字修复

 package-lock.json

@@ -28,6 +28,7 @@
        "lodash": "^4.17.21",
        "mitt": "^3.0.1",
        "nprogress": "^0.2.0",
        "qs": "^6.14.0",
        "sm-crypto": "^0.3.13",
        "v-code-diff": "^1.13.1",
        "vue": "^3.5.13",
@@ -2022,6 +2023,22 @@
        "node": ">= 0.4"
      }
    },
    "node_modules/call-bound": {
      "version": "1.0.4",
      "resolved": "https://registry.npmmirror.com/call-bound/-/call-bound-1.0.4.tgz",
      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
      "license": "MIT",
      "dependencies": {
        "call-bind-apply-helpers": "^1.0.2",
        "get-intrinsic": "^1.3.0"
      },
      "engines": {
        "node": ">= 0.4"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/chalk": {
      "version": "4.1.2",
      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
@@ -3222,6 +3239,18 @@
      "integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==",
      "license": "MIT"
    },
    "node_modules/object-inspect": {
      "version": "1.13.4",
      "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.4.tgz",
      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
      "license": "MIT",
      "engines": {
        "node": ">= 0.4"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/object-refs": {
      "version": "0.3.0",
      "resolved": "https://registry.npmmirror.com/object-refs/-/object-refs-0.3.0.tgz",
@@ -3346,6 +3375,21 @@
      "version": "1.1.0",
      "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
    },
    "node_modules/qs": {
      "version": "6.14.0",
      "resolved": "https://registry.npmmirror.com/qs/-/qs-6.14.0.tgz",
      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
      "license": "BSD-3-Clause",
      "dependencies": {
        "side-channel": "^1.1.0"
      },
      "engines": {
        "node": ">=0.6"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/queue-microtask": {
      "version": "1.2.3",
@@ -3516,6 +3560,78 @@
      "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==",
      "license": "MIT"
    },
    "node_modules/side-channel": {
      "version": "1.1.0",
      "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.1.0.tgz",
      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
      "license": "MIT",
      "dependencies": {
        "es-errors": "^1.3.0",
        "object-inspect": "^1.13.3",
        "side-channel-list": "^1.0.0",
        "side-channel-map": "^1.0.1",
        "side-channel-weakmap": "^1.0.2"
      },
      "engines": {
        "node": ">= 0.4"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/side-channel-list": {
      "version": "1.0.0",
      "resolved": "https://registry.npmmirror.com/side-channel-list/-/side-channel-list-1.0.0.tgz",
      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
      "license": "MIT",
      "dependencies": {
        "es-errors": "^1.3.0",
        "object-inspect": "^1.13.3"
      },
      "engines": {
        "node": ">= 0.4"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/side-channel-map": {
      "version": "1.0.1",
      "resolved": "https://registry.npmmirror.com/side-channel-map/-/side-channel-map-1.0.1.tgz",
      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
      "license": "MIT",
      "dependencies": {
        "call-bound": "^1.0.2",
        "es-errors": "^1.3.0",
        "get-intrinsic": "^1.2.5",
        "object-inspect": "^1.13.3"
      },
      "engines": {
        "node": ">= 0.4"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/side-channel-weakmap": {
      "version": "1.0.2",
      "resolved": "https://registry.npmmirror.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
      "license": "MIT",
      "dependencies": {
        "call-bound": "^1.0.2",
        "es-errors": "^1.3.0",
        "get-intrinsic": "^1.2.5",
        "object-inspect": "^1.13.3",
        "side-channel-map": "^1.0.1"
      },
      "engines": {
        "node": ">= 0.4"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/signature_pad": {
      "version": "5.0.4",
      "resolved": "https://registry.npmmirror.com/signature_pad/-/signature_pad-5.0.4.tgz",

 package.json

@@ -30,6 +30,7 @@
    "lodash": "^4.17.21",
    "mitt": "^3.0.1",
    "nprogress": "^0.2.0",
    "qs": "^6.14.0",
    "sm-crypto": "^0.3.13",
    "v-code-diff": "^1.13.1",
    "vue": "^3.5.13",

 src/views/flow/components/TodolistRightTop.vue

@@ -22,7 +22,7 @@
        <el-form-item label="零组件号">
            <el-input v-model="formInline.drawingNo" placeholder="" style="width: 200px"></el-input>
        </el-form-item>
        <el-form-item label="图号版次">
        <el-form-item label="图纸版次">
            <el-input v-model="formInline.drawingNoEdition" placeholder="" style="width: 200px"></el-input>
        </el-form-item>
        <el-form-item label="批次号">

 src/views/flow/todolist.vue

@@ -538,10 +538,12 @@
                //根据在线文档34行，'发送给'是禁用，但有默认选项
                this.optionApprove.column[1].disabled = true;

                if (["approveTask", 'seniorApproveTask','replaceApprove','unlockApproveTask','appendApproveTask'].includes(row.taskDefinitionKey)) {
                if (["approveTask", 'seniorApproveTask','replaceApprove','appendApproveTask'].includes(row.taskDefinitionKey)) {
                    //审批节点，不通过给编制：编制是责任人，给实际编程员
                    //this.formApprove.assignee = row.variables.programmer;
                    this.formApprove.assignee = row.variables.actProgrammer;//给实际编程员
                }else if(['unlockApproveTask'].includes(row.taskDefinitionKey)){
                    //解锁高师审批节点,上一步是编程
                    this.formApprove.assignee = row.variables.programmer;//给主管工艺
                } else if(["check", 'cureCheckTask','repalceCheckTask','appendCheckTask'].includes(row.taskDefinitionKey)){
                    //校对节点,上一步是编程
                    //this.formApprove.assignee = row.variables.programmer;

 src/views/flowmgr/exceptiontask.vue

@@ -85,7 +85,7 @@
                        prop: 'processEdition'
                    },
                    {
                        label: '图号版次',
                        label: '图纸版次',
                        prop: 'drawingNoEdition'
                    },
                    {

 src/views/flowmgr/programexport.vue

@@ -111,7 +111,7 @@
                        with: 85
                    },
                    {
                        label: '图号版次',
                        label: '图纸版次',
                        prop: 'drawingNoEdition',
                        with: 85
                    },
@@ -185,7 +185,7 @@
                        width: 85
                    },
                    {
                        label: '图号版次',
                        label: '图纸版次',
                        prop: 'drawingNoEdition',
                        width: 85
                    },

 src/views/flowmgr/taskassign.vue

@@ -90,7 +90,7 @@
            rules: [{ required: true, message: '必填', trigger: 'blur' }],
          },
          {
            label: '图号版次',
            label: '图纸版次',
            prop: 'drawingNoEdition',
            type: 'input',
            span: 12,

 src/views/flowmgr/taskassigntemp.vue

@@ -92,7 +92,7 @@
            },
          },
          {
            label: '图号版次',
            label: '图纸版次',
            prop: 'drawingNoEdition',
            type: 'input',
            span: 12,

 src/views/statreport/approveTablePrint.vue

@@ -80,7 +80,7 @@
                        prop: 'processEdition'
                    },
                    {
                        label: '图号版次',
                        label: '图纸版次',
                        prop: 'drawingNoEdition'
                    },
                    {

 src/views/wel/components/TodolistRightTop.vue

@@ -7,7 +7,7 @@
<template>
    <basic-container>
    <el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="120px" disabled>
        <el-form-item label="图号版次">
        <el-form-item label="图纸版次">
            <el-input v-model="formInline.drawingNoEdition" placeholder=""></el-input>
        </el-form-item>
        <el-form-item label="批次号">

 src/views/wel/shemi.vue

@@ -61,7 +61,7 @@
            icon="el-icon-lock" type="primary" @click="showLockDlg(row)" placeholder="锁定" title="锁定"></el-button>
          <el-button :size="size" text
            v-if="permission.lock_button && row.nodeType == 60 && row.parentIds.indexOf('0,2') > -1 && row.isLocked == 1"
            icon="el-icon-unlock" type="primary" @click="startUnlock(row)" placeholder="解锁" title="解锁"></el-button>
            icon="el-icon-unlock" type="primary" @click="showUnLockDlg(row)" placeholder="解锁" title="解锁"></el-button>
        </template>
      </avue-crud>
    </div>
@@ -118,7 +118,7 @@
            icon="el-icon-lock" type="primary" @click="showLockDlg(row)" placeholder="锁定" title="锁定"></el-button>
          <el-button :size="size" text
            v-if="permission.lock_button && row.nodeType == 60 && row.parentIds.indexOf('0,2') > -1 && row.isLocked == 1"
            icon="el-icon-unlock" type="primary" @click="startUnlock(row)" placeholder="解锁" title="解锁"></el-button>
            icon="el-icon-unlock" type="primary" @click="showUnLockDlg(row)" placeholder="解锁" title="解锁"></el-button>
        </template>
      </avue-crud>
    </div>
@@ -142,7 +142,9 @@
    <el-dialog title="程序锁定" append-to-body v-model="lockBox">
      <avue-form :option="lockOption" v-model="lockForm" @submit="lockSubmit" @reset-change="lockCancel" />
    </el-dialog>
    
    <el-dialog title="程序解锁" append-to-body v-model="unlockBox">
      <avue-form :option="unlockOption" v-model="unlockForm" @submit="unlockSubmit" @reset-change="unlockCancel" />
    </el-dialog>
    <avue-tabs :option="tabsOption" @change="tabsHandleChange" style="margin-top: 30px;" v-if="isShowTabs"></avue-tabs>
    <avue-form v-if="tabsType == 'tab1'" :option="tabsFormOption" v-model="tabsForm"></avue-form>
    <!--<span v-else-if="tabsType == 'tab2'">版本信息</span>-->
@@ -191,6 +193,7 @@
import { ElMessage } from 'element-plus';
import TodolistLeft from './components/TodolistLeft.vue';
import TodolistRightTop from './components/TodolistRightTop.vue';
import qs from 'qs';
export default {
  components: {
    TodolistLeft,
@@ -307,22 +310,16 @@
          icon: 'el-icon-info',
          label: '节点信息',
          prop: 'tab1',
        }/*, {
          icon: 'el-icon-warning',
          label: '版本信息',
          prop: 'tab2',
        }*/]
        }
      ]
      },
      tabsOption2: {
        column: [{
          icon: 'el-icon-info',
          label: '节点信息',
          prop: 'tab1',
        },/* {
          icon: 'el-icon-warning',
          label: '版本信息',
          prop: 'tab2',
        }, */{
        },
        {
          icon: 'el-icon-warning',
          label: '文件内容',
          prop: 'tab3'
@@ -464,6 +461,31 @@
      lockForm: {},
      lockBox: false,

      unlockOption: {
        submitText: "启动解锁流程",
        emptyText: "取消",
        menuPosition: "right",
        column: [
          {
            label: '程序包名',
            prop: 'name',
            disabled:true,
            labelWidth: "120",
          },
          
          {
            label: '锁定原因',
            prop: 'remark',
            type: "textarea",
            disabled:true,
            labelWidth: "120",
            span: 24,
          }
        ]
      },
      unlockForm: {},
      unlockBox: false,

      id: "",
      parentId: 1,
      loading: true,
@@ -521,7 +543,7 @@
            width: '360'
          },
          {
            label: '版本',
            label: '程序版本',
            prop: 'versionNumber',
            formatter: (val, value, label) => {
              if (val.nodeType == '60') {
@@ -780,9 +802,10 @@
        });
    },
    showLockDlg(row){
      this.lockForm = row;
     //this.lockForm.name = row.name;
     // this.lockForm.id = row.id;
      //this.lockForm = row;
      this.lockForm.id = row.id;
      this.lockForm.name = row.name
      this.lockForm.parentId = row.parentId;
      this.lockForm.remark = '';
      this.lockBox = true;
    },
@@ -790,33 +813,42 @@
      this.lockBox = false;
      this.lockForm = {};
    },
    lockSubmit() {  
    showUnLockDlg(row){
      this.unlockForm.id = row.id;
      this.unlockForm.name = row.name
      this.unlockForm.remark = row.remark;
      this.unlockForm.parentId = row.parentId;
      this.unlockBox = true;
    },
    lockSubmit(row,done) {  
      //console.log(row,done)
      //锁定提交
      this.$confirm('是否锁定', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
      }).then(() => {
        axios({
          url: '/blade-mdm/program/node/lock',
          method: 'post',
          params: this.lockForm
        }).then(res => {
        axios.post('/blade-mdm/program/node/lock',qs.stringify(this.lockForm)).then(res=>{
          console.log('res',res.data)
          if (res.data.code == 200) {
            this.$message({ type: 'success', message: '操作成功!' });
            this.addLocalTreeNode(this.lockForm.parentId);
            this.lockBox = false;
            
          } else {
            this.$message({ type: 'success', message: res.data.msg });
            this.$message({ type: 'error', message: res.data.msg });
          }
          this.lockBox = false;
        }).catch(error => {
          this.$message({ type: 'error', message: res.data.msg });
        });
        done();
      }).catch(action => {
        console.log('cancel')
      });
    },
    startUnlock(row) {
    unlockSubmit(row,done) {
      //启动解锁流程
      this.$confirm(`是否解锁`, {
      this.$confirm(`确认解锁`, {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
@@ -833,10 +865,14 @@
            this.$message({ type: 'success', message: res.data.msg });
          }
        });
        done();
      }).catch(action => {
        console.log('cancel')
      });
    },
    unlockCancel() {
      this.unlockBox = false;
    },
    handleSubmit(form, done) {
      //发起程序替换流程
      var obj = {

 yarn.lock

@@ -617,6 +617,14 @@
    es-errors "^1.3.0"
    function-bind "^1.1.2"

call-bound@^1.0.2:
  version "1.0.4"
  resolved "https://registry.npmmirror.com/call-bound/-/call-bound-1.0.4.tgz"
  integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
  dependencies:
    call-bind-apply-helpers "^1.0.2"
    get-intrinsic "^1.3.0"

chalk@^4.1.2:
  version "4.1.2"
  resolved "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz"
@@ -1027,7 +1035,7 @@
  resolved "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz"
  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==

get-intrinsic@^1.2.6:
get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.3.0:
  version "1.3.0"
  resolved "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz"
  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
@@ -1422,6 +1430,11 @@
  resolved "https://registry.npmmirror.com/nprogress/-/nprogress-0.2.0.tgz"
  integrity sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==

object-inspect@^1.13.3:
  version "1.13.4"
  resolved "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.4.tgz"
  integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==

object-refs@^0.3.0:
  version "0.3.0"
  resolved "https://registry.npmmirror.com/object-refs/-/object-refs-0.3.0.tgz"
@@ -1494,6 +1507,13 @@
  version "1.1.0"
  resolved "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz"
  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==

qs@^6.14.0:
  version "6.14.0"
  resolved "https://registry.npmmirror.com/qs/-/qs-6.14.0.tgz"
  integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==
  dependencies:
    side-channel "^1.1.0"

queue-microtask@^1.2.2:
  version "1.2.3"
@@ -1588,6 +1608,46 @@
  resolved "https://registry.npmmirror.com/select/-/select-1.1.2.tgz"
  integrity sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==

side-channel-list@^1.0.0:
  version "1.0.0"
  resolved "https://registry.npmmirror.com/side-channel-list/-/side-channel-list-1.0.0.tgz"
  integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
  dependencies:
    es-errors "^1.3.0"
    object-inspect "^1.13.3"

side-channel-map@^1.0.1:
  version "1.0.1"
  resolved "https://registry.npmmirror.com/side-channel-map/-/side-channel-map-1.0.1.tgz"
  integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==
  dependencies:
    call-bound "^1.0.2"
    es-errors "^1.3.0"
    get-intrinsic "^1.2.5"
    object-inspect "^1.13.3"

side-channel-weakmap@^1.0.2:
  version "1.0.2"
  resolved "https://registry.npmmirror.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz"
  integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==
  dependencies:
    call-bound "^1.0.2"
    es-errors "^1.3.0"
    get-intrinsic "^1.2.5"
    object-inspect "^1.13.3"
    side-channel-map "^1.0.1"

side-channel@^1.1.0:
  version "1.1.0"
  resolved "https://registry.npmmirror.com/side-channel/-/side-channel-1.1.0.tgz"
  integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
  dependencies:
    es-errors "^1.3.0"
    object-inspect "^1.13.3"
    side-channel-list "^1.0.0"
    side-channel-map "^1.0.1"
    side-channel-weakmap "^1.0.2"

signature_pad@^5.0.4:
  version "5.0.4"
  resolved "https://registry.npmmirror.com/signature_pad/-/signature_pad-5.0.4.tgz"