loulijun2021
2022-11-29 1d61ba76588d83ae43edc22c16c96fc25b4684be
1.存货档案控制默认工艺路线为必填
已修改5个文件
73 ■■■■■ 文件已修改
src/router/index.js 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/gantt_back/gantt_back.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/sckbg.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/zdpc.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/chda.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.js
@@ -101,22 +101,22 @@
  // { path: '*', redirect: '/404', hidden: true }
]
export const asyncRoutes = [
  // {
  //   path: '/gtt',
  //   component: Layout,
  //   redirect: '/gtt/back',
  //   name: '基础设置',
  //   code: '1001',
  //   meta: { code: '1001', title: '基础设置', icon: 'tree' },
  //   alwaysShow: true, // 当children只有一个时,也显示父菜单
  //   children: [{
  //     path: 'back',
  //     name: 'YYQDCancel',
  //     code: '1011',
  //     component: () => import('@/views/gantt_back/gantt_back'),
  //     meta: { code: '1011', title: '用户清单', icon: '', keepAlive: true }
  //   }]
  // },
  {
    path: '/gtt',
    component: Layout,
    redirect: '/gtt/back',
    name: '基础设置',
    code: '1001',
    meta: { code: '1001', title: '基础设置', icon: 'tree' },
    alwaysShow: true, // 当children只有一个时,也显示父菜单
    children: [{
      path: 'back',
      name: 'YYQDCancel',
      code: '1011',
      component: () => import('@/views/gantt_back/gantt_back'),
      meta: { code: '1011', title: '用户清单', icon: '', keepAlive: true }
    }]
  },
  {
    path: '/jcsz',
    component: Layout,
src/views/gantt_back/gantt_back.vue
@@ -276,7 +276,7 @@
        },
        'rows': [
          {
            'YearDate': '2022-09-27',
            'YearDate': '2022-11-29',
            'children': [
              {
                'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -292,7 +292,7 @@
            ]
          },
          {
            'YearDate': '2022-09-28',
            'YearDate': '2022-11-30',
            'children': [
              {
                'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -308,7 +308,7 @@
            ]
          },
          {
            'YearDate': '2022-09-29',
            'YearDate': '2022-12-01',
            'children': [
              {
                'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -324,7 +324,7 @@
            ]
          },
          {
            'YearDate': '2022-09-30',
            'YearDate': '2022-12-02',
            'children': [
              {
                'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -340,7 +340,7 @@
            ]
          },
          {
            'YearDate': '2022-10-01',
            'YearDate': '2022-12-03',
            'children': [
              {
                'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -356,7 +356,7 @@
            ]
          },
          {
            'YearDate': '2022-10-02',
            'YearDate': '2022-12-04',
            'children': [
              {
                'AdvaDevicNumber': 'LKFDL_SC-PC029',
src/views/scgl/sckbg.vue
@@ -865,12 +865,19 @@
            @click="dialogVisibleConfirm"
          >开 工</el-button>
          <el-button
            v-if="dialogTitle==='自制报工'"
            v-if="dialogTitle==='自制报工'&&dialogForm.nextstepname===''"
            :loading="$store.state.app.buttonIsDisabled"
            :disabled="$store.state.app.buttonIsDisabled"
            type="primary"
            @click="dialogVisibleConfirm"
          >提交/打印</el-button>
          <el-button
            v-if="dialogTitle==='自制报工'&&dialogForm.nextstepname!==''"
            :loading="$store.state.app.buttonIsDisabled"
            :disabled="$store.state.app.buttonIsDisabled"
            type="primary"
            @click="dialogVisibleConfirm"
          >提交</el-button>
          <el-button
            v-if="dialogTitle==='外协发料'"
            :loading="$store.state.app.buttonIsDisabled"
@@ -879,12 +886,19 @@
            @click="dialogVisibleConfirm"
          >发料</el-button>
          <el-button
            v-if="dialogTitle==='外协收料'"
            v-if="dialogTitle==='外协收料'&&dialogForm.nextstepname===''"
            :loading="$store.state.app.buttonIsDisabled"
            :disabled="$store.state.app.buttonIsDisabled"
            type="primary"
            @click="dialogVisibleConfirm"
          >收料/打印</el-button>
          <el-button
            v-if="dialogTitle==='外协收料'&&dialogForm.nextstepname!==''"
            :loading="$store.state.app.buttonIsDisabled"
            :disabled="$store.state.app.buttonIsDisabled"
            type="primary"
            @click="dialogVisibleConfirm"
          >收料</el-button>
        </div>
      </span>
    </el-dialog>
src/views/scgl/zdpc.vue
@@ -200,7 +200,7 @@
                />
              </el-form-item>
              <el-form-item label="排程方式" style=" display: flex;">
                <el-select v-model="formBottom.types" style="width:120px" @change="changeTypes">
                <el-select v-model="formBottom.types" :disabled="radioSelectedId===''" style="width:120px" @change="changeTypes">
                  <el-option value="N" label="设备优先" />
                  <el-option value="Y" label="时间优先" />
                </el-select>
@@ -1042,7 +1042,7 @@
      }
      this.nitialize()// 手动过滤所有设备已排程
      console.log(this.facility_data, 67890)
      if (this.bm_data != '' && this.formBottom.types == 'N') { // 设备优先
        this.fun_time()
        this.change_num(this.bm_data)
src/views/zzmx/chda.vue
@@ -958,10 +958,6 @@
    },
    // 对话框确认
    dialogVisibleConfirm() {
      if (this.defaultroute_codeArr.length > 0 && this.defaultroute_code === '') {
        return this.$message.info('默认工艺路线不能为空!')
      }
      this.$refs.dialogForm.validate(valid => {
        if (valid) {
          this.$store.state.app.buttonIsDisabled = true
@@ -1071,8 +1067,7 @@
    },
    // 确定
    async routeDialogVisibleConfirm() {
      const temp = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
      if (this.defaultroute_code === '' && temp.length > 0) {
      if (this.defaultroute_code === null || this.defaultroute_code === 'null') {
        return this.$message.info('默认工艺路线不能为空!')
      }