1.存货档案的工艺绑定功能实现

小小儁爺

2024-05-30 0d1d41633beaf9a0e5823e09227e8ad70758f6ff

1.存货档案的工艺绑定功能实现

 src/api/ProductModel.js

@@ -114,3 +114,22 @@
    params: data
  })
}

// 存货档案关联工艺(工艺路线/工序)查询
export function TMaterielFileAssociationRoute(data) {
  return request({
    url: 'ProductModel/TMaterielFileAssociationRoute',
    method: 'get',
    params: data
  })
}

// 存货档案关联工艺(工艺路线或工序)提交
export function SaveTMaterielFile(data) {
  return request({
    url: 'ProductModel/SaveTMaterielFile',
    method: 'post',
    data
  })
}


 src/views/basicSettings/processRoute.vue

@@ -379,7 +379,7 @@
      tableData: [],
      tableColumnSettingsArray: [
        { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 隐藏列  show: false隐藏，true显示
        { minWidth: 25, width: 50, prop: 'RowNum', label: '序号', id: 2, show: true, fixed: 'left', sortable: false }, // custom
        { minWidth: 25, width: 50, prop: 'rowNum', label: '序号', id: 2, show: true, fixed: 'left', sortable: false }, // custom
        {
          minWidth: 110,
          width: false,

 src/views/materialManager/inventoryList.vue

@@ -217,6 +217,31 @@
                  {{ row.isMadeRequest === '1' ? '委外' : '' }}
                </template>
              </el-table-column>

              <el-table-column
                label="工艺"
                prop=""

                width="110"
              >
                <template slot-scope="{row}">

                  <i
                    v-if="row.is_retdproc==='Y'"
                    :style="{color:$store.state.settings.theme}"
                    class="el-icon-share"
                    style="cursor: pointer"
                    @click="routeClick(row)"
                  />
                  <i
                    v-if="row.is_retdproc==='N'"
                    style="color:rgb(180 ,181, 185);cursor: pointer"
                    class="el-icon-share"
                    @click="routeClick(row)"
                  />
                </template>
              </el-table-column>

              <!--              <el-table-column-->
              <!--                label="数据来源"-->
              <!--                prop="data_sources"-->
@@ -559,6 +584,146 @@
      </span>
    </el-dialog>

    <!--    工艺路线对话框-->
    <el-dialog
      v-el-drag-dialog
      :close-on-click-modal="false"
      title="关联工艺路线"
      :visible.sync="dialogVisibleRoute"
      width="800px"
      top="5vh"

      class="dialogVisibleRoute"
      @closed="handleCloseRoute"
      @close="handleCloseRoute"
    >
      <div>
        <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> 产品名称：{{
          dialogFormRoute.projectName
        }}
      </div>
      <el-divider />
      <div style="margin-bottom: 10px">
        <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 工艺路线集合
      </div>

      <div class="myCheckboxGroup">
        <div
          v-for="item in dialogFormRoute.routeOperationArr"
          :key="item.code"
          :style="{border:item.isSelected1?'1px solid '+$store.state.settings.theme:'1px solid #eee'}"
          class="myCheckbox"
          @click="myCheckboxClick(item)"
        >
          <!--          <input-->
          <!--            class="myCheckboxInput"-->
          <!--            type="checkbox"-->
          <!--            :value="item.code"-->
          <!--            :name="item.name"-->
          <!--            :style="{color:item.isSelected2?'#42b983':'#fff'}"-->
          <!--            @click="myCheckboxInputClick(item)"-->
          <!--          >{{ item.name }}-->
          <!--            父子点击事件不影响-->
          <!--            onClick="event.cancelBubble = true"-->
          <el-checkbox
            :key="item.code"
            v-model="item.isSelected2"
            class="myCheckboxInput"
            :value="item.code"
            :name="item.name"
            :label="item.name"
            :checked="item.isSelected2"
            @change="myCheckboxInputClick(item)"
          />
          <div class="myCheckboxInputLabel">{{ item.name }}</div>

        </div>
      </div>

      <el-divider />
      <div>
        <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 默认工艺路线
      </div>
      <div style="margin-top: 20px">
        <el-select
          v-model="defaultroute_code"
          filterable
          style="width: 200px;"
          placeholder="请选择"
          class="defaultroute_code"
        >
          <el-option
            v-for="item in defaultroute_codeArr"
            :key="item.code"
            :label="item.name"
            :value="item.code"
          />
        </el-select>
      </div>
      <el-divider />
      <div style="margin-bottom: 10px">
        <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 工序列表
      </div>
      <div style="overflow-y: scroll">
        <el-table
          ref="projectTableData"
          :data="projectTableData"
          border
          height="280"
          :row-class-name="tableRowClassName"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
        >
          <el-table-column
            prop="seq"
            width="100"
            label="工序序号"
            fixed
          />
          <el-table-column
            prop="stepcode"
            show-tooltip-when-overflow
            label="工序编码"
          />
          <el-table-column
            prop="stepname"
            label="工序名称"
            show-tooltip-when-overflow
          />
          <el-table-column
            prop="enable"
            label="启用状态"
            show-tooltip-when-overflow
            fixed="right"
          >
            <template slot-scope="{row}">
              <div v-if="row.enable==='Y'">
                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                是
              </div>
              <div v-if="row.enable==='N'">
                <i class="el-icon-info" style="margin-right: 2px" />
                否
              </div>
            </template>
          </el-table-column>
        </el-table>
      </div>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button v-waves @click="routeDialogVisibleCancel">取 消</el-button>
          <el-button
            v-waves
            type="primary"
            :loading="$store.state.app.buttonIsDisabled"
            :disabled="$store.state.app.buttonIsDisabled"
            @click="routeDialogVisibleConfirm"
          >确 定</el-button>
        </div>
      </span>
    </el-dialog>

  </div>
</template>

@@ -568,15 +733,17 @@
import { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import {
  SaveTMaterielFile,
  TMaterielAddUpdate,
  TMaterielClassTree,
  TMaterielClassTreeAddUpdate,
  TMaterielClassTreeDelete,
  TMaterielData, TMaterielDelete
  TMaterielData, TMaterielDelete, TMaterielFileAssociationRoute
} from '@/api/ProductModel'
import arrayToTree from 'array-to-tree'
import { UnitSerch, WareHouse } from '@/api/GeneralBasicData'
import { SaveSearchMateriel_Info } from '@/api/ErpSyncMes'
import $ from 'jquery'

export default {
  name: 'RoleList',
@@ -680,8 +847,19 @@
      unitcodeGroupArr: [],
      idSubUnitByReportArr: [],
      idUnitBvStockArr: [],
      idwarehouseArr: []
      idwarehouseArr: [],

      // 工艺
      dialogVisibleRoute: false,
      dialogFormRoute: {
        projectName: '', // 产品名称
        projectCode: '', // 产品代码
        routeOperationArr: [] // 工艺路线集合
        // routeOperationSelectedArr: [] // 工艺路线选中集合数组
      },
      defaultroute_code: '', // 默认工艺路线选中值
      defaultroute_codeArr: '', // 默认工艺路线数组
      projectTableData: [] // 设备列表
    }
  },

@@ -696,6 +874,130 @@
    this.getSelectApi()
  },
  methods: {
    tableRowClassName({ row, rowIndex }) {
      return 'custom-row'
    },
    // 工艺路线点击
    /* 点击关联工艺路线模块*/
    // 工艺路线点击
    routeClick(row) {
      const loading = this.$loading({
        lock: true,
        text: '正在加载数据，请稍等...',
        spinner: 'el-icon-loading',
        customClass: 'osloading',
        background: 'rgba(0, 0, 0, 0.7)'
      })

      this.defaultroute_code = row.default_route
      this.dialogFormRoute.projectCode = row.partcode
      this.dialogFormRoute.projectName = row.partname

      TMaterielFileAssociationRoute({ partcode: this.dialogFormRoute.projectCode }).then(res => {
        if (res.code === '200') {
          setTimeout(() => {
            loading.close()
            this.dialogVisibleRoute = true
            this.dialogFormRoute.routeOperationArr = res.data
            // let waitFlag = false// 回显等待是否放行

            this.dialogFormRoute.routeOperationArr.forEach((item, index) => {
              item.isSelected1 = false
              item.isSelected2 = false
              if (index === 0) {
                item.isSelected1 = true
                this.projectTableData = item.Data
              }
              if (item.flag === 'Y') {
                item.isSelected2 = true
                this.$nextTick(() => {
                  $('input:checkbox').eq(index).prop('checked', true)
                })

                // const interval = setInterval(() => {
                //   if ($('input:checkbox').length > 0) {
                //     waitFlag = true
                //   }
                //   if (waitFlag) {
                //     clearInterval(interval)
                //     this.$nextTick(() => {
                //       $('input:checkbox').eq(index).prop('checked', true)
                //     })
                //   }
                // }, 100)
              }
            })

            this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.flag === 'Y')
          }, 1000)
        } else {
          loading.close()
        }
      })
    },
    // 对话框关闭
    handleCloseRoute() {
      this.dialogFormRoute.routeOperationArr = []
      this.defaultroute_codeArr = []
    },
    // 取消
    routeDialogVisibleCancel() {
      this.dialogVisibleRoute = false
    },
    // 确定
    async routeDialogVisibleConfirm() {
      if (this.defaultroute_code === null || this.defaultroute_code === 'null') {
        return this.$message.info('默认工艺路线不能为空！')
      }

      // 提交格式
      const data = []
      this.dialogFormRoute.routeOperationArr.forEach(item => {
        if (item.isSelected2) {
          data.push({ code: item.code, name: item.name })
        }
      })

      const D = [{
        'partcode': this.dialogFormRoute.projectCode,
        'defaultroute_code': this.defaultroute_code,
        'children': data
      }]

      this.$store.state.app.buttonIsDisabled = true
      const res = await SaveTMaterielFile(D)
      if (res.code === '200') {
        this.dialogVisibleRoute = false
        this.$message.success('保存成功！')
        await this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
        this.$store.state.app.buttonIsDisabled = false
      }
    },
    // 大盒子点击事件
    myCheckboxClick(val) {
      console.log(val, 1)
      this.dialogFormRoute.routeOperationArr.forEach(item => {
        item.isSelected1 = val.code === item.code
      })

      this.projectTableData = val.Data
    },
    // 小盒子点击事件
    myCheckboxInputClick(val) {
      // console.log(val, 2)
      val.isSelected2 = !!val.isSelected2

      this.dialogFormRoute.routeOperationArr.forEach((item, index) => {
        if (val.code === item.code) {
          item.flag = !item.flag
        }
      })
      if (val.code === this.defaultroute_code) {
        this.defaultroute_code = ''
      }
      this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
    },

    async getSelectApi() {
      const { data: res } = await UnitSerch({ tunittype: 'M' })
      this.unitcodeGroupArr = res
@@ -1058,6 +1360,7 @@
</script>

<style scoped lang="scss">
$main_color: #42b983;
.custom-tree-node {
  flex: 1;
  display: flex;
@@ -1074,4 +1377,81 @@
.el-icon-plus:hover, .el-icon-edit:hover, .el-icon-delete:hover {
  color: #000 !important;
}

.dialogVisibleRoute {
  .myCheckboxGroup {
    display: flex;
    flex-wrap: wrap;

    .myCheckbox {
      //border: 1px solid $main_color;
      border: 1px solid #eee;
      display: flex;
      min-width: 100px;
      padding: 10px;
      margin: 10px 30px 0 0;
      border-radius: 5px;
      cursor: default;
      position: relative;

      .myCheckboxInput {
        margin: 1px 5px 0 0;
        cursor: pointer;
      }

      .myCheckboxInputLabel {
        position: absolute;
        left: 29px;
        padding: 5px;
        top: 6px;
        color: transparent;
      }

    }

    //.myCheckbox{
    //  border: 1px solid $main_color;
    //}

    input[type=checkbox] {
      cursor: pointer;
      position: relative;
      width: 14px;
      height: 14px;
      font-size: 14px;
    }

    input[type=checkbox]::after {
      position: absolute;
      top: 0;
      //color: rgb(130, 35, 35);
      color: $main_color;
      width: 14px;
      height: 14px;
      display: inline-block;
      visibility: visible;
      padding-left: 0px;
      text-align: center;
      content: ' ';
      border-radius: 3px
    }

    input[type=checkbox]:checked::after {
      //content: "✓";
      content: "√";
      color: #fff;
      font-size: 12px;
      font-weight: bold;
      background-color: $main_color;
    }
  }
}

.defaultroute_code ::v-deep .el-input__suffix-inner {
  display: flex;
  align-items: center;
  justify-content: center;
  margin-top: -3px;
}

</style>

 src/views/systemSetting/processSetting.vue

@@ -107,6 +107,7 @@

<script>
import { SaveSystemProcConfig } from '@/api/systemSetting'
import { logout } from '@/api/user'

export default {
  name: 'ProcessSetting',
@@ -144,7 +145,7 @@
      }
    },
    save() {
      this.$confirm('是否确认保存?', '提示', {
      this.$confirm('是否确认保存?保存成功之后自动跳转登录页重新登录', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
@@ -163,6 +164,13 @@
          if (res.code === '200') {
            localStorage.setItem('mesSetting', JSON.stringify(data))
            this.$notify.success('保存成功！')

            setTimeout(() => {
              logout().then(res => {
                localStorage.removeItem('token')
                this.$router.push({ path: this.redirect || '/' })
              })
            }, 2000)
          }
        })
      }).catch(() => {