Merge remote-tracking branch 'origin/master'

hdy

2023-12-27 63bbd8126166b221e8290758c131eb0a558bf274

Merge remote-tracking branch 'origin/master'

 jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml

@@ -41,6 +41,8 @@
            <if test="processesCode != null  and processesCode != ''"> and processes_code like concat('%', #{processesCode}, '%')</if>
            <if test="productCode != null  and productCode != ''"> and product_code like concat('%', #{productCode}, '%')</if>
            <if test="operationType != null  and operationType != ''"> and operation_type like concat('%', #{operationType}, '%')</if>
            <if test="formulaCode != null  and formulaCode != ''"> and formula_code like concat('%', #{formulaCode}, '%')</if>

        </where>
    </select>
    

 jcdm-ui/src/router/index.js

@@ -135,6 +135,20 @@
    ]
  },
  {
    path: '/main/formula-data',
    component: Layout,
    hidden: true,
    permissions: ['bs:formulaChild:list'],
    children: [
      {
        path: 'index/:formulaCode(\\d+)',
        component: () => import('@/views/main/bs/formulaChild/index'),
        name: 'Data',
        meta: { title: '配方详情', activeMenu: '/main/bs/formulaChild' }
      }
    ]
  },
  {
    path: '/main/route-data',
    component: Layout,
    hidden: true,

 jcdm-ui/src/views/main/bs/formula/index.vue

@@ -92,7 +92,14 @@

        <el-table border v-loading="loading" :data="formulaList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column label="配方编码" width="130" align="center" prop="formulaCode">
<!--          <el-table-column label="配方编码" width="130" align="center" prop="formulaCode">-->
<!--          </el-table-column>-->
          <el-table-column label="配方编码" width="130" align="center" :show-overflow-tooltip="true">
            <template slot-scope="scope">
              <router-link :to="'/main/formula-data/index/' + scope.row.formulaCode" class="link-type">
                <span>{{ scope.row.formulaCode }}</span>
              </router-link>
            </template>
          </el-table-column>
          <el-table-column label="配方名称" width="150" align="center" prop="formulaName">
          </el-table-column>
@@ -104,11 +111,11 @@
          </el-table-column>
          <el-table-column label="创建用户" width="150" align="center" prop="createUser">
          </el-table-column>
          <el-table-column label="创建时间" width="150" align="center" prop="createTime">
          <el-table-column label="创建时间" width="160" align="center" prop="createTime">
          </el-table-column>
          <el-table-column label="更改用户" width="150" align="center" prop="updateUser">
          </el-table-column>
          <el-table-column label="更改时间" width="150" align="center" prop="updateTime">
          <el-table-column label="更改时间" width="160" align="center" prop="updateTime">
          </el-table-column>
          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope">

 jcdm-ui/src/views/main/bs/formulaChild/index.vue

@@ -95,45 +95,84 @@
              v-hasPermi="['bs:formulaChild:export']"
            >导出</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button
              type="warning"
              plain
              icon="el-icon-close"
              size="mini"
              @click="handleClose"
            >关闭</el-button>
          </el-col>
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
        </el-row>

        <el-descriptions class="margin-top" :column="4" :size="size" border>
          <el-descriptions-item :span="1">
            <template slot="label">
              <i class="el-icon-user"></i>
              配方编码
            </template>
            {{headerInformationData.formulaCode}}
          </el-descriptions-item>
          <el-descriptions-item :span="1">
            <template slot="label">
              <i class="el-icon-mobile-phone"></i>
              配方名称
            </template>
            {{headerInformationData.formulaName}}
          </el-descriptions-item>
          <el-descriptions-item :span="1">
            <template slot="label">
              <i class="el-icon-location-outline"></i>
              产品编码
            </template>
            {{headerInformationData.productCode}}
          </el-descriptions-item>
          <el-descriptions-item :span="1">
            <template slot="label">
              <i class="el-icon-tickets"></i>
              产品名称
            </template>
<!--            {{headerInformationData.productName}}-->
          </el-descriptions-item>
        </el-descriptions>

        <el-table border v-loading="loading" :data="formulaChildList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column label="id" align="center" prop="id" />
          <el-table-column label="车间" align="center" prop="workshopCode">
<!--          <el-table-column label="车间" align="center" prop="workshopCode">-->
<!--          </el-table-column>-->
<!--          <el-table-column label="产线" align="center" prop="lineCode">-->
<!--          </el-table-column>-->
          <el-table-column label="工序" width="90" align="center" prop="processesCode">
          </el-table-column>
          <el-table-column label="产线" align="center" prop="lineCode">
          <el-table-column label="产品编号" width="150" align="center" prop="productCode">
          </el-table-column>
          <el-table-column label="工序" align="center" prop="processesCode">
          <el-table-column label="操作内容" :show-overflow-tooltip='true' width="150" align="center" prop="operationSteps">
          </el-table-column>
          <el-table-column label="产品编号" align="center" prop="productCode">
          <el-table-column label="技术要求" width="150" :show-overflow-tooltip='true' align="center" prop="techRequirement">
          </el-table-column>
          <el-table-column label="操作内容" align="center" prop="operationSteps">
          <el-table-column label="类型" width="90" align="center" prop="operationType">
          </el-table-column>
          <el-table-column label="技术要求" :show-overflow-tooltip='true' align="center" prop="techRequirement">
          <el-table-column label="排序" width="90" align="center" prop="stepSort">
          </el-table-column>
          <el-table-column label="类型" align="center" prop="operationType">
          <el-table-column label="参数编码" width="130" align="center" prop="paramCode">
          </el-table-column>
          <el-table-column label="排序" align="center" prop="stepSort">
          <el-table-column label="物料编码" width="130" align="center" prop="materialCode">
          </el-table-column>
          <el-table-column label="参数编码" align="center" prop="paramCode">
          <el-table-column label="配方编码" width="130" align="center" prop="formulaCode">
          </el-table-column>
          <el-table-column label="物料编码" align="center" prop="materialCode">
          <el-table-column label="图片" :show-overflow-tooltip='true' width="130" align="center" prop="picture">
          </el-table-column>
          <el-table-column label="配方编码" align="center" prop="formulaCode">
          <el-table-column label="备注" width="130" align="center" prop="remarks">
          </el-table-column>
          <el-table-column label="图片" align="center" prop="picture">
          <el-table-column label="创建用户" width="130" align="center" prop="createUser">
          </el-table-column>
          <el-table-column label="备注" align="center" prop="remarks">
          <el-table-column label="创建时间" width="150" align="center" prop="createTime">
          </el-table-column>
          <el-table-column label="创建用户" align="center" prop="createUser">
          <el-table-column label="更改用户" width="130" align="center" prop="updateUser">
          </el-table-column>
          <el-table-column label="创建时间" align="center" prop="createTime">
          </el-table-column>
          <el-table-column label="更改用户" align="center" prop="updateUser">
          </el-table-column>
          <el-table-column label="更改时间" align="center" prop="updateTime">
          <el-table-column label="更改时间" width="160" align="center" prop="updateTime">
          </el-table-column>
          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope">
@@ -175,11 +214,14 @@
        {{titleName}}
      </span>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="车间" prop="workshopCode">
          <el-input v-model="form.workshopCode" placeholder="请输入车间" />
        </el-form-item>
        <el-form-item label="产线" prop="lineCode">
          <el-input v-model="form.lineCode" placeholder="请输入产线" />
<!--        <el-form-item label="车间" prop="workshopCode">-->
<!--          <el-input v-model="form.workshopCode" placeholder="请输入车间" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="产线" prop="lineCode">-->
<!--          <el-input v-model="form.lineCode" placeholder="请输入产线" />-->
<!--        </el-form-item>-->
        <el-form-item label="配方编码">
          <el-input v-model="formulaCode" :disabled="true" />
        </el-form-item>
        <el-form-item label="工序" prop="processesCode">
          <el-input v-model="form.processesCode" placeholder="请输入工序" />
@@ -212,9 +254,9 @@
        <el-form-item label="物料编码" prop="materialCode">
          <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
        </el-form-item>
        <el-form-item label="配方编码" prop="formulaCode">
          <el-input v-model="form.formulaCode" placeholder="请输入配方编码" />
        </el-form-item>
<!--        <el-form-item label="配方编码" prop="formulaCode">-->
<!--          <el-input v-model="form.formulaCode" placeholder="请输入配方编码" />-->
<!--        </el-form-item>-->
        <el-form-item label="图片" prop="picture">
          <el-input v-model="form.picture" placeholder="请输入图片" />
        </el-form-item>
@@ -231,12 +273,19 @@
</template>

<script>
import { listFormula} from "@/api/main/bs/formula/formula";
import { listFormulaChild, getFormulaChild, delFormulaChild, addFormulaChild, updateFormulaChild } from "@/api/main/bs/formulaChild/formulaChild";

export default {
  name: "FormulaChild",
  data() {
    return {
      headerInformationData:{
        formulaCode: "",
        formulaName: "",
        productCode: "",
        productName: ""
      },
      // 遮罩层
      loading: true,
      titleName: "",
@@ -250,6 +299,7 @@
      showSearch: true,
      // 总条数
      total: 0,
      formulaCode:  "",
      // 配方配置子信息表格数据
      formulaChildList: [],
      // 弹出层标题
@@ -265,6 +315,7 @@
        processesCode: null,
        productCode: null,
        operationType: null,
        formulaCode: null,
      },
      // 表单参数
      form: {},
@@ -277,9 +328,24 @@
    };
  },
  created() {
    const formulaCode = this.$route.params && this.$route.params.formulaCode;
    this.queryParams.formulaCode = formulaCode;
    this.formulaCode = formulaCode;
    this.headerInformation();
    this.getList();
  },
  methods: {
    /** 工艺流程表头信息 */
    headerInformation() {
      listFormula(this.queryParams).then(response => {
        this.headerInformationData = response.rows[0];
      });
    },
    /** 返回按钮操作 */
    handleClose() {
      const obj = { path: "/main/pm/formula" };
      this.$tab.closeOpenPage(obj);
    },
    /** 查询配方配置子信息列表 */
    getList() {
      this.loading = true;

 jcdm-ui/src/views/main/cfkb/Instructions/index.vue

@@ -3,17 +3,17 @@
    <el-row :gutter="3">
      <el-col :span="6">
        <el-card shadow="always">
          总是显示
          CFMOTO
        </el-card>
      </el-col>
      <el-col :span="3">
        <el-card shadow="always">
          总是显示
          OP030
        </el-card>
      </el-col>
      <el-col :span="15">
        <el-card shadow="always">
          总是显示
          装副轴,拨叉
        </el-card>
      </el-col>
    </el-row>