懒羊羊
2023-12-25 c8a73260e8690da604664a5a8e9473dfbabbb8c1
产线优化
已修改3个文件
54 ■■■■■ 文件已修改
jcdm-ui/src/views/main/bs/lineInfo/index.vue 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/bs/technologyRouteChild/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/om/productionOrde/index.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/bs/lineInfo/index.vue
@@ -84,26 +84,26 @@
    </el-row>
      <el-table v-loading="loading" border :data="lineInfoList" @selection-change="handleSelectionChange" v-if="lineInfoList.length > 0">
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column label="产线编号" align="center" prop="lineCode">
        <el-table-column label="产线编号" width="120" align="center" prop="lineCode">
        </el-table-column>
        <el-table-column :show-overflow-tooltip='true' label="产线名称" align="center" prop="lineName">
      </el-table-column>
        <el-table-column label="车间编码" align="center" prop="workshopCode">
        <el-table-column label="车间编码" width="120" align="center" prop="workshopCode">
        </el-table-column>
        <el-table-column label="车间名称" align="center" prop="workshopName">
        <el-table-column label="车间名称" width="120" align="center" prop="workshopName">
        </el-table-column>
        <el-table-column label="状态" align="center" prop="status" width="80">
          <template slot-scope="scope">
            <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
          </template>
        </el-table-column>
        <el-table-column label="备注" align="center" prop="remarks">
        <el-table-column label="备注" width="150" align="center" prop="remarks">
        </el-table-column>
        <el-table-column label="创建人" align="center" prop="createUser" width="80">
        <el-table-column label="创建人" align="center" prop="createUser" width="150">
        </el-table-column>
        <el-table-column label="创建时间" align="center" prop="createTime" width="170">
        </el-table-column>
        <el-table-column label="更新人" align="center" prop="updateUser" width="80">
        <el-table-column label="更新人" align="center" prop="updateUser" width="150">
        </el-table-column>
        <el-table-column label="更新时间" align="center" prop="updateTime" width="170">
        </el-table-column>
@@ -182,20 +182,17 @@
          <el-input v-model="form.lineName" placeholder="请输入产线名称" />
        </el-form-item>
        <el-form-item label="车间编号" prop="workshopCode">
          <el-input v-model="form.workshopCode" placeholder="请输入车间编号" />
        </el-form-item>
        <el-form-item style="margin-left: -15px" label="车间编号" prop="workshopCode">
          <el-select style="width: 93%" v-model="form.workshopCode" placeholder="请选择车间编号">
          <el-select style="width: 100%" @change="handleSelectChange(form.workshopCode)" v-model="form.workshopCode" placeholder="请选择车间编号">
            <el-option
              v-for="item in lineOptions"
              :key="item.lineCode"
              :label="item.lineName"
              :value="item.lineCode">
              v-for="item in options"
              :key="item.workshopCode"
              :label="item.workshopCode"
              :value="item.workshopCode">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="车间名称" prop="workshopName">
          <el-input v-model="form.workshopName" placeholder="请输入车间名称" />
          <el-input disabled v-model="form.workshopName" placeholder="请输入车间名称" />
        </el-form-item>
        <el-form-item label="状态" prop="status">
          <el-radio-group v-model="form.status">
@@ -221,6 +218,7 @@
<script>
import { listLineInfo, getLineInfo, delLineInfo, addLineInfo, updateLineInfo } from "@/api/main/bs/lineInfo/lineInfo";
import {listWorkshop} from "@/api/main/bs/workshop/workshop";
export default {
  name: "LineInfo",
@@ -229,6 +227,7 @@
    return {
      // 遮罩层
      loading: true,
      options: [],
      titleName: 'test',
      // 选中数组
      ids: [],
@@ -282,8 +281,21 @@
  },
  created() {
    this.getList();
    this.initWorkshop();
  },
  methods: {
    // 在这里编写处理选中事件的逻辑
    handleSelectChange(selectedOption) {
      this.queryParams.workshopCode = selectedOption;
      listWorkshop(this.queryParams).then(response => {
        this.form.workshopName = response.rows[0].workshopName;
      });
    },
    initWorkshop(){
      listWorkshop(this.queryParams).then(response => {
        this.options = response.rows;
      });
    },
    advancedQuery(){
      this.advancedShowSearch = (this.advancedShowSearch) ? this.advancedShowSearch = false : this.advancedShowSearch = true;
    },
jcdm-ui/src/views/main/bs/technologyRouteChild/index.vue
@@ -341,7 +341,7 @@
    },
    /** 返回按钮操作 */
    handleClose() {
      const obj = { path: "/main/technologyRoute" };
      const obj = { path: "/main/pm/technologyRoute" };
      this.$tab.closeOpenPage(obj);
    },
    /** 查询工艺路线子信息列表 */
jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -618,11 +618,13 @@
      if(!selection.length){
        this.single = true
        this.multiple = true
      }else {
        if(selection[0].orderStatus === '1' && selection.length === 1){
          this.single = false
          this.multiple = false
        }
      }
      if(selection[0].orderStatus === '1' && selection.length === 1){
        this.single = false
        this.multiple = false
      }
    },
    /** 新增按钮操作 */
    handleAdd() {