优化

src/views/material/product/components/MaterialAdd.vue

@@ -1,6 +1,6 @@
 
 <template>
-    <ele-modal width="1060px" :visible="visible" v-if="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="物料BOM" @update:visible="updateVisible">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <header-title title="物料BOM"> </header-title>
@@ -80,8 +80,10 @@
                             <el-input v-model="row.subCode" placeholder="请输入"></el-input>
                         </template>
                         <template v-slot:unit="{ row }">
-                            <DictSelection dictName="重量单位" v-model="row.unit"></DictSelection>
+                            <DictSelection dictName="计量单位" v-model="row.unit"></DictSelection>
                         </template>
+
+
                         <template v-slot:count="{ row }">
                             <el-input v-model="row.count" placeholder="请输入" @input="(value) =>
                             (row.count = value.replace(
@@ -90,6 +92,21 @@
                             ))
                                 "></el-input>
                         </template>
+
+                        
+                        <template v-slot:netWeight="{ row }">
+                            <el-input v-model="row.netWeight" placeholder="请输入" @input="(value) =>
+                            (row.netWeight = value.replace(
+                                /^(-)*(\d+)\.(\d\d\d\d\d\d).*$/,
+                                '$1$2.$3'
+                            ))
+                                "></el-input>
+                        </template>
+
+                        <template v-slot:weightUnit="{ row }">
+                            <DictSelection dictName="重量单位" v-model="row.weightUnit"></DictSelection>
+                        </template>
+
                         <template v-slot:categoryName="{ row, $index }">
                             <el-input :value="row.categoryName" placeholder="请选择"
                                 @click.native="categorySelect(row, $index)"></el-input>
@@ -227,15 +244,27 @@ export default {
                     prop: 'modelType'
                 },
                 {
-                    label: '净重',
+                    label: '数量',
                     slot: 'count',
                     action: 'count'
                 },
                 {
-                    label: '重量单位',
+                    label: '计量单位',
                     slot: 'unit',
                     action: 'unit'
                 },
+
+                {
+                    label: '重量',
+                    slot: 'netWeight',
+                    action: 'netWeight'
+                },
+                {
+                    label: '重量单位',
+                    slot: 'weightUnit',
+                    action: 'weightUnit'
+                },
+
                 {
                     action: 'action',
                     slot: 'action',
@@ -292,7 +321,9 @@ export default {
                 brandNum: '',
                 count: '',
                 modelType: '',
-                unit: ''
+                unit: '',
+                netWeight: '',
+                weightUnit: ''
             });
         },
 
@@ -367,6 +398,7 @@ export default {
                 this.$set(this.tableData[idx], 'categoryId', row.id)
                 this.$set(this.tableData[idx], 'categoryCode', row.code)
                 this.$set(this.tableData[idx], 'unit', row.measuringUnit)
+                this.$set(this.tableData[idx], 'weightUnit', row.weightUnit)
                 this.$set(this.tableData[idx], 'brandNum', row.brandNum)
                 this.$set(this.tableData[idx], 'modelType', row.modelType)
 

src/views/material/product/components/MoldInfo.vue

@@ -4,7 +4,7 @@
       <div class="divider">
         <div class="title">
           <div class="ele-bg-primary"></div>
-          <span>模具信息</span>
+          <span>工装模具信息</span>
         </div>
         <div class="ele-bg-primary ele-width"></div>
       </div>
@@ -53,13 +53,40 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
+        <el-col :span="8" class="rx-sc">
           <el-form-item label="芯棒直径" prop="mandrelDiameter">
             <el-input v-model="form.mandrelDiameter">
             </el-input>
           </el-form-item>
         </el-col>
 
+        <el-col :span="24">
+         <div class="rx-sc">
+          <el-form-item label="长" prop="length">
+            <el-input v-model="form.length">
+              <template slot="append">mm</template>
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="宽" prop="breadth">
+            <el-input v-model="form.breadth">
+              <template slot="append">mm</template>
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="高" prop="altitude">
+            <el-input v-model="form.altitude">
+              <template slot="append">mm</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="直径" prop="diameter">
+            <el-input v-model="form.diameter">
+              <template slot="append">mm</template>
+            </el-input>
+          </el-form-item>
+         </div>
+        </el-col>
+
       </el-row>
     </el-form>
   </div>

src/views/material/product/components/index-search.vue

@@ -15,7 +15,7 @@
           <el-input
             clearable
             size="small"
-            v-model="where.keyWord"
+            v-model="where.searchKey"
             placeholder="型号、牌号"
           />
         </el-form-item>

src/views/material/product/detail.vue

@@ -213,6 +213,10 @@ export default {
         ],
         measuringUnit: [
           { required: true, message: '请选择计量单位', trigger: 'change' }
+        ],
+
+        weightUnit: [
+        { required: true, message: '请选择重量单位', trigger: 'change' }
         ]
       },
       PathInfo: {},

src/views/technology/production/components/user-search.vue

@@ -17,19 +17,21 @@
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="性别:">
-          <el-select
-            clearable
-            v-model="where.sex"
-            placeholder="请选择"
-            class="ele-fluid"
-          >
-            <el-option label="男" :value="1" />
-            <el-option label="女" :value="2" />
-          </el-select>
-        </el-form-item>
-      </el-col> -->
+
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
+        <el-form-item label="控制码:" prop="controlId">
+            <el-select v-model="where.controlId" >
+              <el-option
+                v-for="item in controlList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+     
 
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <div class="ele-form-actions">
@@ -47,20 +49,24 @@
     </el-row>
   </el-form>
 </template>
-
+  import control from '@/api/technology/control';
 <script>
+  import control from '@/api/technology/control';
   export default {
+
+  
     data() {
       // 默认表单数据
       const defaultWhere = {
         code: '',
-        name: ''
-        // nickname: '',
-        // sex: undefined
+        name: '',
+        controlId: null
+
       };
       return {
         // 表单数据
-        where: { ...defaultWhere }
+        where: { ...defaultWhere },
+        controlList: [],
       };
     },
     computed: {
@@ -69,6 +75,9 @@
         return this.$store.state.theme.styleResponsive;
       }
     },
+    created() {
+      this.getControlList()
+    },
     methods: {
       /* 搜索 */
       search() {
@@ -78,7 +87,19 @@
       reset() {
         this.where = { ...this.defaultWhere };
         this.search();
-      }
+      },
+
+      
+      getControlList(){
+         const params = {
+           pageNum: 1, size: -1
+         }
+         control.list().then(res=>{
+            this.controlList = res.list
+         })
+      },
+
+
     }
   };
 </script>

src/views/technology/production/index.vue

@@ -2,7 +2,7 @@
   <div class="ele-body">
     <el-card shadow="never">
       <!-- 搜索表单 -->
-      <user-search @search="reload" />
+      <user-search @search="reload"  />
       <!-- 数据表格 -->
       <ele-pro-table
         ref="table"

vue.config.js

@@ -32,8 +32,8 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        target: 'http://124.71.68.31:50001',
-        // target: 'http://192.168.1.139:18086',
+        // target: 'http://124.71.68.31:50001',
+        target: 'http://192.168.1.139:18086',
         // target: 'http://192.168.1.132:18086',
               // target: 'http://124.71.21.222:50001',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域