修复工艺bug

zss

2023-12-05 820e0a3ba5a1cb735c85a82d5ee5855dfd7afd60

修复工艺bug

 src/views/common/operation.vue

@@ -94,8 +94,8 @@
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
          }/*,
           {
            minWidth: '100',
            prop: 'productionCounting',
            label: '是否报工',
@@ -159,7 +159,7 @@
            optList: () => {
              return this.getChangeList()
            }
          }
          } */
        ]
      },
      addOrUpdateVisible: false,

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

@@ -75,32 +75,26 @@
                </el-input>
              </el-form-item>

              <el-form-item label="替代号" prop="alternativeNo">
              <!-- <el-form-item label="替代号" prop="alternativeNo">
                <el-input
                  v-model="treeForm.alternativeNo"
                  placeholder="替代号"
                  disabled
                >
                </el-input>
              </el-form-item>
              </el-form-item> -->

              <el-form-item label="替代描述" prop="alternativeDesc">
              <!-- <el-form-item label="替代描述" prop="alternativeDesc">
                <el-input
                  v-model="treeForm.alternativeDesc"
                  placeholder="替代描述"
                  disabled
                >
                </el-input>
              </el-form-item>
              </el-form-item> -->

              <el-form-item label="绝缘颜色">
                <el-input
                  v-model="treeForm.insulationColor"
                  placeholder="绝缘颜色"
                >
                </el-input>
              </el-form-item>
              <el-form-item label="护套颜色">
              <!--   -->
              <!-- <el-form-item label="护套颜色">
                <el-input v-model="treeForm.sheathColor" placeholder="护套颜色">
                </el-input>
              </el-form-item>
@@ -110,7 +104,7 @@
                  placeholder="特性1"
                >
                </el-input>
              </el-form-item>
              </el-form-item> -->
            </el-col>
          </el-row>
        </el-form>
@@ -134,7 +128,7 @@
            <el-table-column label="零件名称" prop="partName"></el-table-column>
            <el-table-column label="单位" prop="unit"></el-table-column>
            <el-table-column label="数量" prop="qpa"></el-table-column>
            <el-table-column label="盘数" prop="discNum"></el-table-column>
            <!-- <el-table-column label="盘数" prop="discNum"></el-table-column> -->
          </el-table>
          <!-- <el-table
            class="tree-select-table"

 src/views/technology/completeproductstructure/index.vue

@@ -20,12 +20,13 @@
import {
  fetchList,
  delObj,
  addByStructure
  addByStructure,
} from '@/api/technology/completeproductstructure'
import ttable from '@/views/common/ztt-table.vue'
import { mapGetters } from 'vuex'
import { changeState } from '../../../api/technology/completeproductstructure'
import { remote } from '@/api/admin/dict'

export default {
  data() {
    return {
@@ -34,7 +35,7 @@
      uploadInfo: {
        // 是否展示上传EXCEL以及对应的url
        isShow: true,
        url: 'mes/bom/uploadExcel'
        url: 'mes/bom/uploadExcel',
      },
      prelang: 'completeProductStructure',
      options: {
@@ -49,7 +50,7 @@
        isRefresh: true, // 是否显示刷新按钮
        isShowHide: true, // 是否显示显影按钮
        isSearch: false, // 高级查询按钮
        defaultOrderBy: { column: 'id', direction: 'desc' }
        defaultOrderBy: { column: 'id', direction: 'desc' },
      },
      table: {
        total: 0,
@@ -67,7 +68,7 @@
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text',
            render: { fun: this.addOrUpdateHandle }
            render: { fun: this.addOrUpdateHandle },
          },
          // 零件名称
          {
@@ -77,7 +78,7 @@
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
            searchInfoType: 'text',
          },
          // 零件号
          {
@@ -87,7 +88,7 @@
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
            searchInfoType: 'text',
          },

          // 状态
@@ -112,7 +113,7 @@
                formatVal = '已取消'
              }
              return formatVal
            }
            },
          },

          // 类型
@@ -127,7 +128,7 @@
            formatter: this.formatBomTypeDbType,
            optList: () => {
              return this.bomTypeDbOptions
            }
            },
          },
          // 版本号
          {
@@ -137,61 +138,61 @@
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
            searchInfoType: 'text',
          },

          // 替代号
          {
            minWidth: '120',
            prop: 'alternativeNo',
            label: '替代号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'alternativeNo',
          //   label: '替代号',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text',
          // },

          // 替代描述
          {
            minWidth: '120',
            prop: 'alternativeDesc',
            label: '替代描述',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'alternativeDesc',
          //   label: '替代描述',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text',
          // },

          // 绝缘颜色
          {
            minWidth: '120',
            prop: 'insulationColor',
            label: '绝缘颜色',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'insulationColor',
          //   label: '绝缘颜色',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text',
          // },
          // 护套颜色
          {
            minWidth: '120',
            prop: 'sheathColor',
            label: '护套颜色',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'sheathColor',
          //   label: '护套颜色',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text',
          // },
          // 特性1
          {
            minWidth: '120',
            prop: 'characteristicOne',
            label: '特性1',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'characteristicOne',
          //   label: '特性1',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text',
          // },
          // 创建人
          {
            minWidth: '120',
@@ -200,7 +201,7 @@
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
            searchInfoType: 'text',
          },
          // 创建时间
          {
@@ -210,8 +211,8 @@
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'datetimerange'
          }
            searchInfoType: 'datetimerange',
          },
        ],
        toolbar: [
          // {
@@ -226,7 +227,7 @@
            text: '产品结构生成BOM',
            fun: this.addByStructureHandle,
            disabled: false,
            permitArr: []
            permitArr: [],
          },
          {
            text: '批准',
@@ -234,7 +235,7 @@
              this.approveHandle('ACCEPT')
            },
            disabled: false,
            permitArr: ['01draft']
            permitArr: ['01draft'],
          },
          {
            text: '撤回',
@@ -242,7 +243,7 @@
              this.approveHandle('REVOKE')
            },
            disabled: false,
            permitArr: ['02accepted']
            permitArr: ['02accepted'],
          },
          {
            text: '拒绝',
@@ -250,7 +251,7 @@
              this.approveHandle('CANCEL')
            },
            disabled: false,
            permitArr: ['02accepted']
            permitArr: ['02accepted'],
          },
          {
            text: '删除',
@@ -258,46 +259,46 @@
              this.deleteAll()
            },
            disabled: false,
            permitArr: []
          }
            permitArr: [],
          },
        ],
        operator: [
          {
            text: '删除',
            type: 'text',
            size: 'small',
            fun: this.deleteHandle
          }
            fun: this.deleteHandle,
          },
        ],
        operatorConfig: {
          fixed: 'right',
          label: '操作',
          width: 100,
          minWidth: 100
        }
          minWidth: 100,
        },
      },
      stateOptionList: [
        {
          value: '01draft',
          label: '草稿'
          label: '草稿',
        },
        {
          value: '02accepted',
          label: '已接受'
          label: '已接受',
        },
        {
          value: '03cancelled',
          label: '已取消'
        }
          label: '已取消',
        },
      ],
      bomTypeDbOptions: []
      bomTypeDbOptions: [],
    }
  },
  components: {
    ttable
    ttable,
  },
  computed: {
    ...mapGetters(['permissions'])
    ...mapGetters(['permissions']),
  },
  activated() {
    this.getData()
@@ -334,16 +335,20 @@
    addOrUpdateHandle(row) {
      this.$router.push({
        name: 'completeProductStructure',
        params: { id: row == null ? null : row.id }
        params: { id: row == null ? null : row.id },
      })
    },
    // 按产品结构生成BOM
    addByStructureHandle() {
      addByStructure()
      this.$message({
        message: '已在后台生成BOM，请执行结束后刷新页面',
        type: 'success'
      addByStructure().then((res) => {
        let result = Array.from(new Set(res.data.data))
        this.$message.success(result.join(','))
        this.getData()
      })
      // this.$message({
      //   message: '已在后台生成BOM，请执行结束后刷新页面',
      //   type: 'success',
      // })
    },
    // 删除
    deleteHandle(row) {
@@ -351,9 +356,9 @@
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
        closeOnClickModal: false
        closeOnClickModal: false,
      })
        .then(function() {
        .then(function () {
          const ids = []
          ids.push(row.id)
          return delObj(ids)
@@ -375,9 +380,9 @@
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'warning',
          closeOnClickModal: false
          closeOnClickModal: false,
        })
          .then(function() {
          .then(function () {
            const ids = that.multipleSelection.map((item) => {
              return item.id
            })
@@ -428,7 +433,7 @@
    handleSelectionChange(val) {
      // 根据状态，禁用表头按钮
      // 筛选出选中记录的状态
      var stateArr = val.map(function(value, index) {
      var stateArr = val.map(function (value, index) {
        return value.state
      })
      // 选中状态数组元素去重
@@ -458,7 +463,7 @@
    },
    getStateOptionList() {
      return this.stateOptionList
    }
  }
    },
  },
}
</script>

 src/views/technology/operation/index.vue

@@ -35,7 +35,7 @@
      multipleSelection: [],
      uploadInfo: {
        // 是否展示上传EXCEL以及对应的url
        isShow: true,
        isShow: false,
        url: '/mes/operation/excel/upload'
      },
      prelang: 'operation',
@@ -186,19 +186,19 @@
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          {
            minWidth: '120',
            prop: 'outsideOpItem',
            label: '外部工序项目',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'select',
            formatter: this.formatOutsideOpItem,
            optList: () => {
              return this.outsideOpItemOptions
            }
          },
          // {
          //   minWidth: '120',
          //   prop: 'outsideOpItem',
          //   label: '外部工序项目',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'select',
          //   formatter: this.formatOutsideOpItem,
          //   optList: () => {
          //     return this.outsideOpItemOptions
          //   }
          // },
          // 备注
          {
            minWidth: '120',

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

@@ -150,7 +150,7 @@
              </el-form-item>
            </el-col>
          </el-row>
          <el-row style="padding-top: 10px">
          <!-- <el-row style="padding-top: 10px">
            <el-col :span="24">
              <el-form-item label="配置项">
                <el-checkbox-group
@@ -182,7 +182,7 @@
                </el-checkbox-group>
              </el-form-item>
            </el-col>
          </el-row>
          </el-row> -->
        </el-form>
      </div>


 src/views/technology/routing/edit-routing-operation.vue

@@ -35,7 +35,7 @@
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="12">
        <!-- <el-col :span="12">
          <el-form-item label="因素单位" prop="runTimeCodeDb" :rules="disabled ?  [{required: false}] : dataRule.runTimeCodeDb">
            <el-select
              v-model="dataForm.runTimeCodeDb"
@@ -51,9 +51,9 @@
              />
            </el-select>
          </el-form-item>
        </el-col>
        </el-col> -->
      </el-row>
      <el-row>
      <!-- <el-row>
        <el-col :span="12">
          <el-form-item label="机器运转因素" prop="machRunFactor" :rules="disabled ?  [{required: false}] : dataRule.machRunFactor">
            <el-input
@@ -92,7 +92,7 @@
            ></el-input>
          </el-form-item>
        </el-col>
      </el-row>
      </el-row> -->
      <el-row>
        <el-col :span="12">
          <el-form-item label="人工类别" prop="laborClassNo">
@@ -124,7 +124,7 @@
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="12">
        <!-- <el-col :span="12">
          <el-form-item label="外部工序项目" prop="outsideOpItem">
            <el-select
              v-model="dataForm.outsideOpItem"
@@ -141,7 +141,7 @@
              />
            </el-select>
          </el-form-item>
        </el-col>
        </el-col> -->
        <el-col :span="12"> </el-col>
      </el-row>
    </el-form>

 src/views/technology/routing/index.vue

@@ -196,7 +196,7 @@
            noShowTip: false
          },
          // 是否为主工艺
          {
          /* {
            minWidth: '120',
            prop: 'master',
            label: '主工艺',
@@ -210,7 +210,7 @@
            formatter: (row, column, cellValue) => {
              return cellValue == true ? '是' : '否'
            }
          },
          }, */
          // 状态
          {
            minWidth: '120',
@@ -300,7 +300,7 @@
            searchInfoType: 'datetimerange'
          },
          // 替代
          {
          /* {
            minWidth: '120',
            prop: 'alternativeNo',
            label: '替代',
@@ -308,9 +308,9 @@
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          }, */
          // 替代描述
          {
         /*  {
            minWidth: '120',
            prop: 'alternativeDesc',
            label: '替代描述',
@@ -318,7 +318,7 @@
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          }, */
          // 是否已同步至IFS
          // {
          //   minWidth: '120',

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

@@ -58,13 +58,13 @@
                  style="width: 280px"
                ></el-input>
              </el-form-item>
              <el-form-item prop="wireCore" label="线芯">
              <!-- <el-form-item prop="wireCore" label="线芯">
                <el-input
                  v-model="dataForm.wireCore"
                  placeholder="线芯"
                  style="width: 60px"
                ></el-input>
              </el-form-item>
              </el-form-item> -->
              <el-form-item label="BOM" prop="bomId">
                <el-select :disabled="dataForm.id != null" v-model="dataForm.bomId" placeholder="" filterable>
                  <el-option
@@ -133,9 +133,9 @@
                  >{{ dataForm.ifsSync ? '是' : '否' }}</span
                >
              </el-form-item> -->
              <el-form-item label="主工艺" prop="master">
              <!-- <el-form-item label="主工艺" prop="master">
                <el-switch v-model="dataForm.master"> </el-switch>
              </el-form-item>
              </el-form-item> -->
            </el-col>
          </el-row>
        </el-form>
@@ -277,13 +277,13 @@
                <span v-if="!editable">{{ scope.row.operationName }}</span>
              </template>
            </el-table-column>
            <el-table-column
            <!-- <el-table-column
              prop="outsideOpItem"
              label="外部工序项目"
              align="center"
              show-overflow-tooltip
            >
            </el-table-column>
            </el-table-column> -->
            <el-table-column
              prop="partName"
              label="零件"
@@ -310,7 +310,7 @@
                }}</span>
              </template>
            </el-table-column>
            <el-table-column
            <!-- <el-table-column
              prop="runTimeCodeDb"
              label="因素单位"
              align="center"
@@ -350,7 +350,7 @@
              label="劳力设置时间"
              align="center"
            >
            </el-table-column>
            </el-table-column> -->
            <el-table-column
              prop="laborClassNo"
              label="人工类别"
@@ -428,7 +428,7 @@
                </el-input>
              </div>

              <el-divider content-position="left">配置项</el-divider>
              <!-- <el-divider content-position="left">配置项</el-divider>

              <div class="node-content-config">
                <el-checkbox-group
@@ -462,7 +462,7 @@
                    >工单预留</el-checkbox-button
                  >
                </el-checkbox-group>
              </div>
              </div> -->

              <!-- <el-divider content-position="left">能力</el-divider>
              <div class="node-content">

 src/views/technology/structure/index.vue

@@ -235,7 +235,7 @@
            }
          },
          // 是否为默认结构
          {
          /* {
            minWidth: '120',
            prop: 'master',
            label: '默认结构',
@@ -249,7 +249,7 @@
            formatter: (row, column, cellValue) => {
              return cellValue == true ? '是' : '否'
            }
          },
          }, */
          // 描述
          {
            minWidth: '120',

 src/views/technology/structure/single-structure-form.vue

@@ -88,9 +88,9 @@
                  >{{ dataForm.ifsSync ? '是' : '否' }}</span
                >
              </el-form-item> -->
              <el-form-item label="默认结构" prop="master">
              <!-- <el-form-item label="默认结构" prop="master">
                <el-checkbox v-model="dataForm.master"></el-checkbox>
              </el-form-item>
              </el-form-item> -->
            </el-col>
          </el-row>
        </el-form>
@@ -196,7 +196,7 @@

            <el-table-column label="单位" prop="unit" align="center">
            </el-table-column>
            <el-table-column label="盘数(盘)" prop="discNum" align="center">
            <!-- <el-table-column label="盘数(盘)" prop="discNum" align="center">
              <template slot-scope="scope">
                <el-input
                  size="small"
@@ -208,7 +208,7 @@
                  scope.row.discNum
                }}</span>
              </template>
            </el-table-column>
            </el-table-column> -->
            <!-- <el-table-column label="图号" prop="drawingNumber" align="center">
            </el-table-column> -->
            <el-table-column align="center" label="操作" width="85px">