优化

src/api/technology/productParam/index.js

@@ -3,7 +3,7 @@ import request from '@/utils/request';
 export default {
   //列表
   list: async (params) => {
-    const res = await request.get('/main/produceparam/page', { params });
+    const res = await request.get('/main/categoryparam/page', { params });
     if (res.data.code == 0) {
       return res.data.data;
     }
@@ -32,17 +32,17 @@ export default {
       return '保存' + res.data.message;
     }
   },
-  //保存
+  //修改
   update: async (data) => {
-    const res = await request.put('/main/produceparam/update', data);
+    const res = await request.put('/main/categoryparam/update', data);
     if (res.data.code == 0) {
-      console.log('修改');
+   
       return '修改' + res.data.message;
     }
   },
   //删除
   delete: async (data) => {
-    const res = await request.delete('/main/produceparam/delete', { data });
+    const res = await request.delete('/main/categoryparam/delete', { data });
     if (res.data.code == 0) {
       return res.data.message;
     }

src/views/technology/productParam/components/ProductModal.vue

@@ -145,8 +145,8 @@ export default {
       this.reload();
     },
     /* 刷新表格 */
-    reload() {
-      this.$refs.table.reload();
+    reload(where) {
+      this.$refs.table.reload({ pageNum: 1, where: where });
     },
     open(item, title, categoryLevelId) {
       if (item) {

src/views/technology/productParam/components/product-search.vue

@@ -7,23 +7,23 @@
     @submit.native.prevent
   >
     <el-row :gutter="10">
-      <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
+      <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="编码">
           <el-input clearable v-model="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
+      <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="名称">
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
 
-      <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
+      <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
         <el-form-item label="型号">
           <el-input clearable v-model="where.modelType" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
+      <el-col v-bind="styleResponsive ? { md: 4 } : { md: 4 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"

src/views/technology/productParam/components/user-edit.vue

@@ -1,6 +1,6 @@
 <!-- 用户编辑弹窗 -->
 <template>
-  <ele-modal width="1160px" :visible="visible" :append-to-body="true" :close-on-click-modal="true"
+  <ele-modal width="1160px" :visible="visible" v-if="visible" :append-to-body="true" :close-on-click-modal="true"
     custom-class="ele-dialog-form" :title="isUpdate ? '修改参数' : '添加参数'" @update:visible="updateVisible">
     <header-title title="基本信息"></header-title>
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
@@ -42,9 +42,9 @@
 
 
         <el-col :span="8">
-          <el-form-item label="生产版本:" prop="produceVersionId">
-            <el-select v-model="form.produceVersionId" filterable placeholder="清选择">
-              <el-option v-for="item in VersionList" :key="item.value" :label="item.label" :value="item.value">
+          <el-form-item label="生产版本:" prop="produceVersionId" >
+            <el-select v-model="form.produceVersionId" filterable placeholder="清选择"  :style="{ width: '100%' }" >
+              <el-option v-for="item in versionList" :key="item.id" :label="item.code + '-' + item.name" :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
@@ -189,8 +189,8 @@ import parameter from '@/api/technology/productParam';
 import ProductModal from './ProductModal.vue';
 import Process from './process.vue'
 import ParamModal from './ParamModal.vue'
-import { deepClone } from '@/components/FormGenerator/utils/index';
 
+import {  pageList } from '@/api/technology/version/version.js';
 export default {
   components: {
     ProductModal,
@@ -225,7 +225,7 @@ export default {
       // 表单数据
       form: { ...defaultForm },
 
-      VersionList: [],
+      versionList: [],
 
 
 
@@ -360,8 +360,7 @@ export default {
 
     chooseModal(data) {
       this.$refs.table.setData([...data, ...this.$refs.table.getData()]);
-      let _arr = JSON.stringify([...data, ...this.$refs.table.getData()])
-      this.$set(this.form, 'taskParam', _arr)
+      this.$set(this.form, 'produceParam', this.$refs.table.getData())
     },
 
     /* 表格数据源 */
@@ -425,13 +424,20 @@ export default {
         size: 100
       });
       this.paramList = res.list
-      console.log(this.paramList)
+    
 
     },
 
+    async getVersionList() {
+      const res = await pageList({
+        pageNum: 1,
+        size: 100
+      });
+      this.versionList = res.list
+    },
+
     chooseProcess(data) {
-      let _arr = JSON.stringify(data)
-      this.$set(this.form, 'produceParam', _arr)
+      this.$set(this.form, 'taskParam', data)
     },
   },
 
@@ -439,6 +445,7 @@ export default {
     async visible(visible) {
       if (visible) {
         this.getParamList()
+        this.getVersionList()
 
         if (this.data) {
           const res = await parameter.getById(this.data.id);

src/views/technology/productParam/index.vue

@@ -4,22 +4,10 @@
       <!-- 搜索表单 -->
       <user-search @search="reload" />
       <!-- 数据表格 -->
-      <ele-pro-table
-        ref="table"
-        :columns="columns"
-        :datasource="datasource"
-        :selection.sync="selection"
-        row-key="code"
-      >
+      <ele-pro-table ref="table" :columns="columns" :datasource="datasource" :selection.sync="selection" row-key="code">
         <!-- 表头工具栏 -->
         <template v-slot:toolbar>
-          <el-button
-            size="small"
-            type="primary"
-            icon="el-icon-plus"
-            class="ele-btn-icon"
-            @click="openEdit()"
-          >
+          <el-button size="small" type="primary" icon="el-icon-plus" class="ele-btn-icon" @click="openEdit()">
             新建
           </el-button>
           <!-- <el-button
@@ -40,20 +28,11 @@
 
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
-          <el-link
-            type="primary"
-            :underline="false"
-            icon="el-icon-edit"
-            @click="openEdit(row)"
-          >
+          <el-link type="primary" :underline="false" icon="el-icon-edit" @click="openEdit(row)">
             修改
           </el-link>
 
-          <el-popconfirm
-            class="ele-action"
-            title="确定要删除当前工序吗？"
-            @confirm="remove(row)"
-          >
+          <el-popconfirm class="ele-action" title="确定要删除当前参数吗？" @confirm="remove(row)">
             <template v-slot:reference>
               <el-link type="danger" :underline="false" icon="el-icon-delete">
                 删除
@@ -64,194 +43,189 @@
       </ele-pro-table>
     </el-card>
     <!-- 编辑弹窗 -->
-    <user-edit
-      :visible.sync="showEdit"
-      :data="current"
-      @done="reload"
-      ref="userEdit"
-    />
+    <user-edit :visible.sync="showEdit" :data="current" @done="reload" ref="userEdit" />
     <!-- 导入弹窗 -->
   </div>
 </template>
 
 <script>
-  import UserSearch from './components/user-search.vue';
-  import UserEdit from './components/user-edit.vue';
+import UserSearch from './components/user-search.vue';
+import UserEdit from './components/user-edit.vue';
 
-  import parameter from '@/api/technology/parameter';
+import parameter from '@/api/technology/productParam';
 
-  export default {
-    name: 'technologyParameter',
-    components: {
-      UserSearch,
-      UserEdit
-    },
-    data() {
-      return {
-        // 表格列配置
-        columns: [
-          {
-            prop: 'code',
-            label: '参数编码',
-            // sortable: 'custom',
-            showOverflowTooltip: true,
-            align: 'center',
+export default {
+  name: 'productParam',
+  components: {
+    UserSearch,
+    UserEdit
+  },
+  data() {
+    return {
+      // 表格列配置
+      columns: [
+        {
+          prop: 'code',
+          label: '参数编码',
+          // sortable: 'custom',
+          showOverflowTooltip: true,
+          align: 'center',
 
-            minWidth: 110
-          },
-          {
-            prop: 'name',
-            label: '参数名称',
-            showOverflowTooltip: true,
-            align: 'center',
-            minWidth: 110
-          },
-          {
-            align: 'center',
-            prop: '',
-            label: '产品类别',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
-          {
-            prop: '',
-            label: '产品编码',
-            align: 'center',
-            showOverflowTooltip: true
-          },
-          {
-            prop: '',
-            label: '产品名称',
-            align: 'center',
-            showOverflowTooltip: true
-          },
-          {
-            prop: '',
-            label: '牌号',
-            align: 'center',
-            showOverflowTooltip: true
-          },
-          {
-            prop: '',
-            label: '型号',
-            align: 'center',
-            showOverflowTooltip: true
-          },
+          minWidth: 110
+        },
+        {
+          prop: 'name',
+          label: '参数名称',
+          showOverflowTooltip: true,
+          align: 'center',
+          minWidth: 110
+        },
+        {
+          align: 'center',
+          prop: '',
+          label: '产品类别',
+          showOverflowTooltip: true,
+          minWidth: 110
+        },
+        {
+          prop: 'categoryCode',
+          label: '产品编码',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          prop: '',
+          label: '产品名称',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          prop: '',
+          label: '牌号',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          prop: '',
+          label: '型号',
+          align: 'center',
+          showOverflowTooltip: true
+        },
 
-          {
-            prop: '',
-            label: 'MRP代码',
-            align: 'center',
-            showOverflowTooltip: true
-          },
+        {
+          prop: '',
+          label: 'MRP代码',
+          align: 'center',
+          showOverflowTooltip: true
+        },
 
 
-          {
-            prop: '',
-            label: '生产版本',
-            align: 'center',
-            showOverflowTooltip: true
-          },
+        {
+          prop: 'produceVersionId',
+          label: '生产版本',
+          align: 'center',
+          showOverflowTooltip: true
+        },
 
 
-          {
-            columnKey: 'action',
-            label: '操作',
-            width: 220,
-            align: 'center',
-            resizable: false,
-            slot: 'action',
-            showOverflowTooltip: true
-          }
-        ],
-        statusList: [
-          { label: '工艺', value: 0 },
-          { label: '工序', value: 1 },
-          { label: '产品', value: 2 },
-          { label: '原料', value: 3 },
-          { label: '设备', value: 4 },
-          { label: '其他', value: 5 }
-        ],
-        // 表格选中数据
-        selection: [],
-        // 当前编辑数据
-        current: null,
-        // 是否显示编辑弹窗
-        showEdit: false,
-        // 是否显示导入弹窗
-        showImport: false
-      };
+        {
+          columnKey: 'action',
+          label: '操作',
+          width: 220,
+          align: 'center',
+          resizable: false,
+          slot: 'action',
+          showOverflowTooltip: true
+        }
+      ],
+      statusList: [
+        { label: '工艺', value: 0 },
+        { label: '工序', value: 1 },
+        { label: '产品', value: 2 },
+        { label: '原料', value: 3 },
+        { label: '设备', value: 4 },
+        { label: '其他', value: 5 }
+      ],
+      // 表格选中数据
+      selection: [],
+      // 当前编辑数据
+      current: null,
+      // 是否显示编辑弹窗
+      showEdit: false,
+      // 是否显示导入弹窗
+      showImport: false
+    };
+  },
+  methods: {
+    /*回显类型 */
+    checkType(id) {
+      const obj = this.statusList.find((item) => item.value == id);
+      return obj.label;
+    },
+    /* 表格数据源 */
+    async datasource({ page, limit, where, order }) {
+      const res = await parameter.list({
+        ...where,
+        ...order,
+        pageNum: page,
+        size: limit
+      });
+      return res;
     },
-    methods: {
-      /*回显类型 */
-      checkType(id) {
-        const obj = this.statusList.find((item) => item.value == id);
-        return obj.label;
-      },
-      /* 表格数据源 */
-      async datasource({ page, limit, where, order }) {
-        const res = await parameter.list({
-          ...where,
-          ...order,
-          pageNum: page,
-          size: limit
-        });
-        return res;
-      },
 
-      /* 刷新表格 */
-      reload(where) {
-        this.$refs.table.reload({ page: 1, where: where });
-      },
-      /* 打开编辑弹窗 */
-      openEdit(row) {
-        this.current = row;
-        this.showEdit = true;
-        this.$refs.userEdit.$refs.form &&
-          this.$refs.userEdit.$refs.form.clearValidate();
-      },
+    /* 刷新表格 */
+    reload(where) {
+      this.$refs.table.reload({ page: 1, where: where });
+    },
+    /* 打开编辑弹窗 */
+    openEdit(row) {
+      this.current = row;
+      this.showEdit = true;
+      this.$refs.userEdit.$refs.form &&
+        this.$refs.userEdit.$refs.form.clearValidate();
+    },
 
-      /* 删除 */
-      remove(row) {
-        const loading = this.$loading({ lock: true });
+    /* 删除 */
+    remove(row) {
+      const loading = this.$loading({ lock: true });
 
-        parameter
-          .delete([row.id])
-          .then((msg) => {
-            loading.close();
-            this.$message.success('删除' + msg);
-            this.reload();
-          })
-          .catch((e) => {
-            loading.close();
-            // this.$message.error(e.message);
-          });
-      },
-      /* 批量删除 */
-      removeBatch() {
-        if (!this.selection.length) {
-          this.$message.error('请至少选择一条数据');
-          return;
-        }
-        this.$confirm('确定要删除选中的工序吗?', '提示', {
-          type: 'warning'
+      parameter
+        .delete([row.id])
+        .then((msg) => {
+          loading.close();
+          this.$message.success('删除' + msg);
+          this.reload();
         })
-          .then(() => {
-            const loading = this.$loading({ lock: true });
-            parameter
-              .delete(this.selection.map((d) => d.id))
-              .then((msg) => {
-                loading.close();
-                this.$message.success('删除' + msg);
-                this.reload();
-              })
-              .catch((e) => {
-                loading.close();
-                // this.$message.error(e.message);
-              });
-          })
-          .catch(() => {});
+        .catch((e) => {
+          loading.close();
+          // this.$message.error(e.message);
+        });
+    },
+    /* 批量删除 */
+    removeBatch() {
+      if (!this.selection.length) {
+        this.$message.error('请至少选择一条数据');
+        return;
       }
+      this.$confirm('确定要删除选中的工序吗?', '提示', {
+        type: 'warning'
+      })
+        .then(() => {
+          const loading = this.$loading({ lock: true });
+          parameter
+            .delete(this.selection.map((d) => d.id))
+            .then((msg) => {
+              loading.close();
+              this.$message.success('删除' + msg);
+              this.reload();
+            })
+            .catch((e) => {
+              loading.close();
+              // this.$message.error(e.message);
+            });
+        })
+        .catch(() => { });
     }
-  };
+  }
+};
 </script>