生产方案页面

src/views/mes/pro/productionSolution/components/ProcessProd.vue

@@ -8,7 +8,7 @@
       append-to-body
       title="设置物料"
     >
-      <el-row :gutter="10" class="mb8">
+      <!-- <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button
             type="primary"
@@ -19,14 +19,14 @@
             >新增</el-button
           >
         </el-col> 
-      </el-row>
+      </el-row>-->
       <el-table :data="tableData">
         <el-table-column label="物料名称" prop="itemName" align="center" />
         <el-table-column label="单位" prop="unitOfMeasure" align="center" />
         <el-table-column label="数量" prop="quantity" align="center" />
         <el-table-column label="备注" prop="remark" align="center" />
         <el-table-column label="操作" align="center" width="150">
-          <template slot-scope="{ row, $index }">
+          <!-- <template slot-scope="{ row, $index }">
             <el-button
               type="text"
               icon="el-icon-edit"
@@ -41,7 +41,7 @@
               @click="deleteRow($index)"
               >删除</el-button
             >
-          </template>
+          </template> -->
         </el-table-column>
       </el-table>
 

src/views/mes/pro/productionSolution/components/ProcessQcindex.vue

+<template>
+  <div class="process-prod">
+    <!-- 设置检验项弹窗 -->
+    <el-dialog
+      :visible.sync="showProcessProd"
+      width="800px"
+      :before-close="beforeClose"
+      append-to-body
+      title="设置检验项"
+    >
+      <!-- <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+          >新增</el-button
+          >
+        </el-col>
+      </el-row> -->
+      <el-table :data="tableData">
+        <el-table-column label="检测项编码" align="center" prop="indexCode" />
+        <el-table-column label="检测项名称" align="center" prop="indexName" />
+        <el-table-column label="检测项类型" align="center" prop="indexType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="检测工具" align="center" prop="qcTool" />
+        <el-table-column label="备注" prop="remark" align="center" />
+        <el-table-column label="操作" align="center" width="150">
+          <template slot-scope="{ row, $index }">
+            <el-button
+              type="text"
+              icon="el-icon-edit"
+              size="small"
+              @click="updateRow(row, $index)"
+            >修改</el-button
+            >
+            <el-button
+              type="text"
+              icon="el-icon-delete"
+              size="small"
+              @click="deleteRow($index)"
+            >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div slot="footer">
+        <el-button type="primary" size="small" @click="cancleConnect"
+        >关闭</el-button
+        >
+      </div>
+    </el-dialog>
+
+    <!-- 编辑检验项关联信息 -->
+    <el-dialog
+      :visible.sync="editConnectVisible"
+      width="800px"
+      title="编辑检验项关联信息"
+    >
+      <el-form ref="form" :model="form" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="检测项编码" prop="indexCode" >
+              <el-input v-model="form.indexCode"  placeholder="请选择测项编码"
+                        readonly>
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click="$refs['QcindexSelectRef'].showFlag = true"
+                ></el-button>
+              </el-input>
+              <QcindexSelect ref="QcindexSelectRef" @onSelected="onQcindexSelect" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" :rows="3"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer">
+        <el-button type="primary" size="small" @click="addOrEditubmit"
+        >确认</el-button
+        >
+        <el-button size="small" @click="editConnectVisible = false"
+        >取消</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import QcindexSelect from "@/components/qcindexSelect/single.vue";
+  export default {
+    props: {
+      process: {
+        type: Object,
+        default: () => ({}),
+      },
+    },
+    components: { QcindexSelect },
+    dicts: ['mes_index_type'],
+    data() {
+      return {
+        form: {
+          indexCode: "",
+          indexName: "",
+          indexType: "",
+          qcTool:"",
+          qcindexId:"",
+          remark: "",
+        },
+        currentRowIdx: undefined,
+        tableData: [],
+        selectedItemId: undefined,
+        selectedRows: null,
+        showFlag: false,
+        optType:null,
+        showProcessProd: false,
+        editConnectVisible: false,
+      };
+    },
+    computed: {
+      title() {
+        return "设置" + this.process.itemName + "检验项";
+      },
+    },
+    watch: {
+      process: {
+        handler(val) {
+          this.tableData = val.qcindexList;
+        },
+        deep: true,
+      },
+    },
+    methods: {
+      handleRowChange(row) {
+        if (row) {
+          this.selectedRows = row;
+        }
+      },
+      handleRowDbClick(row) {
+        if (row) {
+          this.selectedRows = row;
+          this.tableData.unshift(this.selectedRows);
+          this.showFlag = false;
+        }
+      },
+      /**新增按钮 */
+      handleAdd() {
+        this.resetForm();
+        this.optType='add';
+        this.editConnectVisible = true;
+      },
+      /**编辑 */
+      updateRow(row, idx) {
+        this.resetForm();
+        Object.assign(this.form, row);
+        this.currentRowIdx = idx;
+        this.optType='edit';
+        this.editConnectVisible = true;
+      },
+      /**新增 */
+      configmSelect() {
+        if (this.form.indexCode == null || this.form.indexCode == 0) {
+          return;
+        }
+        this.tableData.unshift({
+          ...this.form,
+          processId: this.process.processId,
+
+        });
+        this.editConnectVisible = false;
+      },
+      /** 提交编辑关联信息 */
+      submitEditConnect() {
+        this.tableData.splice(this.currentRowIdx, 1, {
+          ...this.form,
+        });
+        this.editConnectVisible = false;
+      },
+      addOrEditubmit(){
+        if(this.optType=='add'){
+          this.configmSelect();
+        }else{
+          this.submitEditConnect();
+        }
+      },
+      deleteRow(index) {
+        this.tableData.splice(index, 1);
+      },
+      cancleConnect() {
+        this.$emit("updateQcindex", this.tableData);
+        this.showProcessProd = false;
+      },
+      beforeClose(done) {
+        // 更新父组件的processItemList
+        this.$emit("updateQcindex", this.tableData);
+        done();
+      },
+      /**重置表单 */
+      resetForm() {
+        this.form = {
+          indexCode: "",
+          indexName: "",
+          indexType: "",
+          qcTool:"",
+          qcindexId:"",
+          remark: "",
+        };
+      },
+      onQcindexSelect(row){
+        if (row != undefined && row != null) {
+          this.form.indexCode = row.indexCode;
+          this.form.indexName = row.indexName;
+          this.form.qcTool = row.qcTool;
+          this.form.qcindexId = row.indexId;
+        }
+      }
+    },
+  };
+</script>
+
+<style>
+  .process-prod {
+    padding: 0 20px;
+  }
+</style>

src/views/mes/pro/productionSolution/components/ProcessTool.vue

+<template>
+  <div class="process-prod">
+    <!-- 设置工装量具弹窗 -->
+    <el-dialog
+      :visible.sync="showProcessProd"
+      width="800px"
+      :before-close="beforeClose"
+      append-to-body
+      title="设置工装量具"
+    >
+      <!--  <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+          >新增</el-button
+          > 
+        </el-col>
+      </el-row> -->
+      <el-table :data="tableData">
+        <el-table-column label="编号" align="center" prop="toolCode" >
+        </el-table-column>
+        <el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/>
+        <el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/>
+        <el-table-column label="类型" align="center" prop="toolTypeName" />
+        <el-table-column label="要求数量" align="center" prop="quantity" />
+        <el-table-column label="备注" prop="remark" align="center" />
+        <el-table-column label="操作" align="center" width="150">
+          <template slot-scope="{ row, $index }">
+            <el-button
+              type="text"
+              icon="el-icon-edit"
+              size="small"
+              @click="updateRow(row, $index)"
+            >修改</el-button
+            >
+            <el-button
+              type="text"
+              icon="el-icon-delete"
+              size="small"
+              @click="deleteRow($index)"
+            >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div slot="footer">
+        <el-button type="primary" size="small" @click="cancleConnect"
+        >关闭</el-button
+        >
+      </div>
+    </el-dialog>
+
+    <!-- 编辑工装量具关联信息 -->
+    <el-dialog
+      :visible.sync="editConnectVisible"
+      width="800px"
+      title="编辑工装量具关联信息"
+    >
+      <el-form ref="form" :model="form" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="工装量具编码" prop="toolCode" >
+              <el-input v-model="form.toolCode"  placeholder="请选择测项编码"
+                        readonly>
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click="$refs['TmToolSelectRef'].showFlag = true"
+                ></el-button>
+              </el-input>
+              <TmToolSelect ref="TmToolSelectRef" @onSelected="onTmToolSelect" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="要求数量" prop="quantity">
+              <el-input
+                type="number"
+                v-model="form.quantity"
+                placeholder="请输入要求数量"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" :rows="3"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer">
+        <el-button type="primary" size="small" @click="addOrEditubmit"
+        >确认</el-button
+        >
+        <el-button size="small" @click="editConnectVisible = false"
+        >取消</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import TmToolSelect from "@/components/TmTool/index.vue";
+  export default {
+    props: {
+      process: {
+        type: Object,
+        default: () => ({}),
+      },
+    },
+    components: { TmToolSelect },
+    dicts: ['mes_index_type'],
+    data() {
+      return {
+        form: {
+          toolCode: "",
+          toolName: "",
+          brand: "",
+          spec:"",
+          toolTypeName:"",
+          remark: "",
+          quantity: "",
+          toolId:"",
+        },
+        currentRowIdx: undefined,
+        tableData: [],
+        selectedItemId: undefined,
+        selectedRows: null,
+        showFlag: false,
+        optType:null,
+        showProcessProd: false,
+        editConnectVisible: false,
+      };
+    },
+    computed: {
+      title() {
+        return "设置" + this.process.itemName + "工装量具";
+      },
+    },
+    watch: {
+      process: {
+        handler(val) {
+          this.tableData = val.toolList;
+        },
+        deep: true,
+      },
+    },
+    methods: {
+      handleRowChange(row) {
+        if (row) {
+          this.selectedRows = row;
+        }
+      },
+      handleRowDbClick(row) {
+        if (row) {
+          this.selectedRows = row;
+          this.tableData.unshift(this.selectedRows);
+          this.showFlag = false;
+        }
+      },
+      /**新增按钮 */
+      handleAdd() {
+        this.resetForm();
+        this.optType='add';
+        this.editConnectVisible = true;
+      },
+      /**编辑 */
+      updateRow(row, idx) {
+        this.resetForm();
+        Object.assign(this.form, row);
+        this.currentRowIdx = idx;
+        this.optType='edit';
+        this.editConnectVisible = true;
+      },
+      /**新增 */
+      configmSelect() {
+        if (this.form.toolCode == null || this.form.toolCode == 0) {
+          return;
+        }
+        this.tableData.unshift({
+          ...this.form,
+          processId: this.process.processId,
+
+        });
+        this.editConnectVisible = false;
+      },
+      /** 提交编辑关联信息 */
+      submitEditConnect() {
+        this.tableData.splice(this.currentRowIdx, 1, {
+          ...this.form,
+        });
+        this.editConnectVisible = false;
+      },
+      addOrEditubmit(){
+        if(this.optType=='add'){
+          this.configmSelect();
+        }else{
+          this.submitEditConnect();
+        }
+      },
+      deleteRow(index) {
+        this.tableData.splice(index, 1);
+      },
+      cancleConnect() {
+        this.$emit("updateTool", this.tableData);
+        this.showProcessProd = false;
+      },
+      beforeClose(done) {
+        // 更新父组件的processItemList
+        this.$emit("updateTool", this.tableData);
+        done();
+      },
+      /**重置表单 */
+      resetForm() {
+        this.form = {
+          toolCode: "",
+          toolName: "",
+          brand: "",
+          spec:"",
+          toolTypeName:"",
+          toolId:"",
+          quantity: "",
+          remark: "",
+        };
+      },
+      onTmToolSelect(row){
+        if (row != undefined && row != null) {
+          this.form.toolCode = row.toolCode;
+          this.form.toolName = row.toolName;
+          this.form.brand = row.brand;
+          this.form.spec = row.spec;
+          this.form.toolTypeName = row.toolTypeName;
+          this.form.toolId = row.toolId;
+        }
+      }
+    },
+  };
+</script>
+
+<style>
+  .process-prod {
+    padding: 0 20px;
+  }
+</style>

src/views/mes/pro/productionSolution/components/ProogingBom.vue

@@ -2,14 +2,14 @@
   <div>
     <el-row :gutter="10" class="mb8" v-if="mode != 'info'">
       <el-col :span="1.5">
-        <el-button
+        <!-- <el-button
           type="primary"
           plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
           >新增</el-button
-        >
+        > -->
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -34,27 +34,27 @@
         label="组件数量"
         align="center"
         prop="quantity"
-        width="120"
+        
       />
       <el-table-column
         label="计量单位"
         align="center"
         prop="unitOfMeasure"
-        width="120"
+        
       />
       <el-table-column
         label="替代组"
         align="center"
         prop="alternativeGroup"
-        width="120"
+       
       />
       <el-table-column
-        v-if="mode != 'info'"
+        v-if="mode != 'edit'"
         label="操作"
         align="center"
-        width="120"
+       
       >
-        <template slot-scope="{ row, $index }">
+        <!-- <template slot-scope="{ row, $index }">
           <el-button
             type="text"
             icon="el-icon-edit"
@@ -69,7 +69,7 @@
             @click="deleteRow($index)"
             >删除</el-button
           > 
-        </template>
+        </template>-->
       </el-table-column>
     </el-table>
 

src/views/mes/pro/productionSolution/components/ProogingProcess.vue

@@ -12,27 +12,33 @@
       <el-table-column label="标准工时" prop="stdWorkingTime" align="center" />
       <el-table-column label="甘特图显示颜色" prop="colorCode" align="center" />
      <el-table-column
-        v-if="mode != 'info'"
         label="操作"
         align="center"
-        width="150"
+        width="300"
+        fixed="right"
       >
         <template slot-scope="{ row, $index }">
           <el-button
             type="text"
-            icon="el-icon-edit"
             size="small"
             @click="openSetProd(row, $index)"
           >
-            设置物料
+            查看物料
           </el-button>
           <el-button
             type="text"
-            icon="el-icon-edit"
             size="small"
-            @click="updateRow(row, $index)"
-            >修改</el-button
+            @click="openSetQrindex(row, $index)"
           >
+            查看检验项
+          </el-button>
+          <el-button
+            type="text"
+            size="small"
+            @click="openSetTool(row, $index)"
+          >
+            查看工装量具
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -43,6 +49,14 @@
       ref="ProcessProdRef"
       @updateItem="updateItem"
     />
+    <ProcessQcindex
+      :process="currentRow"
+      ref="ProcessQcindexRef"
+    />
+        <ProcessTool
+          :process="currentRow"
+          ref="ProcessToolRef"
+        />
 
     <el-dialog
       v-dialogDrag
@@ -101,9 +115,11 @@
 <script>
 import ItemBomSelect from "@/components/itemBomSelect/single.vue";
 import ProcessProd from "./ProcessProd.vue";
+  import ProcessQcindex from "./ProcessQcindex.vue";
+  import ProcessTool from "./ProcessTool.vue";
 import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
 export default {
-  components: { ItemBomSelect, ProcessProd, WorkstationSelect },
+  components: { ItemBomSelect, ProcessProd, ProcessQcindex,ProcessTool,WorkstationSelect },
   inject: ["mode"],
   props: {
     bomList: {
@@ -145,6 +161,16 @@ export default {
         this.currentRowIndex = idx;
         this.$refs["ProcessProdRef"].showProcessProd = true;
       },
+      openSetQrindex(row, idx) {
+        this.currentRow = row;
+        this.currentRowIndex = idx;
+        this.$refs["ProcessQcindexRef"].showProcessProd = true;
+      },
+      openSetTool(row, idx) {
+        this.currentRow = row;
+        this.currentRowIndex = idx;
+        this.$refs["ProcessToolRef"].showProcessProd = true;
+      },
     /**更新行 */
     updateRow(row, idx) {
       Object.assign(this.form, row);

src/views/mes/pro/productionSolution/proofingApply.vue

@@ -16,15 +16,26 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+ <el-form-item label="生产用途" prop="usageName">
+        <el-input
+          v-model="queryParams.usageName"
+          placeholder="请输入生产用途"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+
+<!--       
       <el-form-item label="生产用途" prop="usageName">
         <el-select
           v-model="queryParams.prototypeRequestStatus"
           clearable
           placeholder="请输入生产用途"
           @keyup.enter.native="usageName"
-        >
-        </el-select>
-      </el-form-item>
+        />
+  
+      </el-form-item> -->
       <!-- <el-form-item label="样品名称" prop="abbreviation">
         <el-input
           v-model="queryParams.itemName"