소스 검색

1. spc任务管理页面增加字段
2. Xbar-S控制图页面增加字段

luofeng 1 개월 전
부모
커밋
584ff4c31a
2개의 변경된 파일37개의 추가작업 그리고 17개의 파일을 삭제
  1. 9 0
      src/views/analysis/process/Xbar-RList.vue
  2. 28 17
      src/views/analysis/spc/index.vue

+ 9 - 0
src/views/analysis/process/Xbar-RList.vue

@@ -107,6 +107,11 @@
                   ><span>{{ row.model }}</span>
                 </template>
               </el-table-column>
+              <el-table-column align="center" prop="code" label="产品编号">
+                <template #default="{ row }"
+                  ><span>{{ row.code }}</span>
+                </template>
+              </el-table-column>
               <el-table-column align="center" prop="batchNo" label="生产批号">
                 <template #default="{ row }"
                   ><span>{{ row.batchNo }}</span>
@@ -281,6 +286,9 @@
               <el-form-item label="产品型号" prop="model">
                 <el-input :disabled="true" v-model="addData.model" />
               </el-form-item>
+              <el-form-item label="产品编号" prop="code">
+                <el-input :disabled="true" v-model="addData.code" />
+              </el-form-item>
               <el-form-item label="数据来源" prop="source">
                 <el-input :disabled="true" v-model="addData.source" />
               </el-form-item>
@@ -606,6 +614,7 @@ const taskChange = (value) => {
   taskOption.value.forEach((item) => {
     if (item.id == value) {
       addData.value.model = item.prodtModel;
+      addData.value.code = item.prodtCode;
       addData.value.source = item.source;
       if (item.source === "手动") {
         accuracysSum.value = Number(item.processCount);

+ 28 - 17
src/views/analysis/spc/index.vue

@@ -20,6 +20,7 @@
       <el-table :data="tableData" border>
         <el-table-column align="center" prop="taskCode" label="任务编号" />
         <el-table-column align="center" prop="prodtModel" label="产品型号" />
+        <el-table-column align="center" prop="prodtCode" label="产品编号" />
         <el-table-column align="center" prop="operationName" label="工序名称" />
         <el-table-column align="center" prop="source" label="采集数据源" />
         <!--        <el-table-column prop="param" label="控制参数" />-->
@@ -97,19 +98,26 @@
           <el-form-item label="任务编号" prop="taskCode">
             <el-input v-model="formData.taskCode" />
           </el-form-item>
-          <el-form-item label="产品型号" prop="prodtModel">
-            <el-input v-model="formData.prodtModel" />
+          <el-form-item label="产品型号" prop="Index1">
+            <el-select
+              v-model="formData.Index1"
+              @change="
+                (value) => {
+                  taskChange(value);
+                }
+              "
+            >
+              <el-option
+                v-for="(item, index) in opInfoData"
+                :key="index"
+                :label="item.prodtModel"
+                :value="index"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="产品编号" prop="prodtCode">
+            <el-input :disabled="true" v-model="formData.prodtCode" />
           </el-form-item>
-          <!--          <el-form-item label="产品型号" prop="Index1">-->
-          <!--            <el-select v-model="formData.Index1">-->
-          <!--              <el-option-->
-          <!--                v-for="(item, index) in opInfoData"-->
-          <!--                :key="index"-->
-          <!--                :label="item.prodtModel"-->
-          <!--                :value="index"-->
-          <!--              />-->
-          <!--            </el-select>-->
-          <!--          </el-form-item>-->
           <el-form-item label="工序名称" prop="Index2">
             <el-select v-model="formData.Index2">
               <el-option
@@ -243,7 +251,6 @@ const toRuler = (row) => {
   router.push({ name: "SPCrules" });
 };
 const getData = async (obj) => {
-  console.log("222222222222222222");
   const { data, code } = await getTableData({
     ...searchRef.value.searchForm,
     pageNo: currentOption.page,
@@ -266,7 +273,7 @@ const rules = {
       message: "请输入任务编号",
     },
   ],
-  prodtModel: [
+  Index1: [
     {
       required: true,
       message: "请选择产品型号",
@@ -386,8 +393,6 @@ const reset = () => {
     limit: 10,
     pageSizes: [10, 20, 30, 40, 50],
   };
-  console.log(currentOption.value, "currentOption.value");
-  console.log("11111111111111111");
 };
 
 const resetData = () => {
@@ -403,7 +408,10 @@ const toSubmit = async () => {
           chart: formData.value.chart,
           operationCode: opOptions.value[formData.value.Index2].dictValue,
           operationName: opOptions.value[formData.value.Index2].dictLabel,
-          prodtModel: formData.value.prodtModel,
+          prodtCode: opInfoData.value[formData.value.Index1].prodtCode,
+          prodtModel: opInfoData.value[formData.value.Index1].prodtModel,
+          prodtName: opInfoData.value[formData.value.Index1].prodtName,
+          unit: opInfoData.value[formData.value.Index1].unit,
           param: formData.value.param,
           source: formData.value.source,
           processCount: formData.value.processCount,
@@ -448,6 +456,9 @@ const getBaseDatas = async () => {
   const { data, code } = await getBaseData();
   opInfoData.value = data;
 };
+const taskChange = (value) => {
+  formData.value.prodtCode = opInfoData.value[value].prodtCode;
+};
 onMounted(() => {
   setHeight();
   getBaseDatas();