Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2023-11-17 d5da5dece1162b8d781e8fb9546c7f8798b880c9

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 src/views/plan/manufacturingorder/index.vue

@@ -824,12 +824,12 @@
        ],
        toolbar: [],
        operator: [
          {
            text: '查看库存',
            type: 'text',
            size: 'small',
            fun: this.searchStock
          }
          // {
          //   text: '查看库存',
          //   type: 'text',
          //   size: 'small',
          //   fun: this.searchStock
          // }
        ],
        operatorConfig: {
          fixed: 'right',

 src/views/plan/masterproductionschedule/index.vue

@@ -771,8 +771,8 @@
      return ''
    },
    // 删除
    deleteHandle(row) {
      this.$confirm('是否确认删除ID为' + row.id, '提示', {
    deleteMainPlan(row) {
      this.$confirm('是否确认作废ID为' + row.id, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        closeOnClickModal: false,

 src/views/technology/operation/operation-form.vue

@@ -592,8 +592,8 @@
      // }
    },
    init() {
      this.operationId = this.dataForm.id
      this.fetchCapabilityForOperation()
      // this.operationId = this.dataForm.id
      // this.fetchCapabilityForOperation()
      if (this.dataForm.id) {
        getObj(this.dataForm.id).then((response) => {
          this.dataForm = response.data.data