规格尺寸改规格

src/views/basicData/check.vue

@@ -95,7 +95,7 @@
               <el-descriptions direction="vertical" border :column="5">
                 <el-descriptions-item label="批次号" :labelStyle="{'text-align': 'center'}" :contentStyle="{'text-align': 'center'}">{{ formData.batchNo }}</el-descriptions-item>
                 <el-descriptions-item label="产品名称" :labelStyle="{'text-align': 'center'}" :contentStyle="{'text-align': 'center'}">{{ formData.productName }}</el-descriptions-item>
-                <el-descriptions-item label="规格尺寸" :labelStyle="{'text-align': 'center'}" :contentStyle="{'text-align': 'center'}">{{ formData.spec }}</el-descriptions-item>
+                <el-descriptions-item label="规格" :labelStyle="{'text-align': 'center'}" :contentStyle="{'text-align': 'center'}">{{ formData.spec }}</el-descriptions-item>
                 <el-descriptions-item label="材质" :labelStyle="{'text-align': 'center'}" :contentStyle="{'text-align': 'center'}">{{ formData.material }}</el-descriptions-item>
                 <el-descriptions-item label="重量" :labelStyle="{'text-align': 'center'}" :contentStyle="{'text-align': 'center'}">{{ formData.weight }}</el-descriptions-item>
               </el-descriptions>

src/views/basicData/produce.vue

@@ -35,7 +35,7 @@
         <el-table-column type="index" width="60" label="序号" align="center" />
         <el-table-column prop="batchNo" label="批次号" align="center" />
         <el-table-column prop="productName" label="产品名称" align="center" />
-        <el-table-column prop="spec" label="规格尺寸" align="center" />
+        <el-table-column prop="spec" label="规格" align="center" />
         <el-table-column prop="material" label="材质" align="center" />
         <el-table-column prop="weight" label="重量" align="center" />
         <el-table-column prop="total" label="生产总数" align="center" />
@@ -111,7 +111,7 @@
                 <el-form-item label="产品名称 :">
                   <el-select v-model="formData.productId" filterable clearable style="width: 100%;" @change="changeProduct">
                     <el-option v-for="item in productList" :key="item.productId" :label="item.name" :value="item.productId">
-                      <span style="float: left">{{ item.name }}</span>
+                      <span style="float: left">{{ (item.name ? item.name : '') + (item.spec ? '(' + item.spec + ')' : '')}}</span>
                       <span style="float: right; color: #8492a6; font-size: 13px">{{ item.material }}</span>
                     </el-option>
                   </el-select>
@@ -168,7 +168,7 @@
               <el-descriptions direction="vertical" border :column="5">
                 <el-descriptions-item label="批次号" :labelStyle="{'text-align': 'center'}" :contentStyle="{'text-align': 'center'}">{{ bindForm.batchNo }}</el-descriptions-item>
                 <el-descriptions-item label="产品名称" :labelStyle="{'text-align': 'center'}" :contentStyle="{'text-align': 'center'}">{{ bindForm.productName }}</el-descriptions-item>
-                <el-descriptions-item label="规格尺寸" :labelStyle="{'text-align': 'center'}" :contentStyle="{'text-align': 'center'}">{{ bindForm.spec }}</el-descriptions-item>
+                <el-descriptions-item label="规格" :labelStyle="{'text-align': 'center'}" :contentStyle="{'text-align': 'center'}">{{ bindForm.spec }}</el-descriptions-item>
                 <el-descriptions-item label="材质" :labelStyle="{'text-align': 'center'}" :contentStyle="{'text-align': 'center'}">{{ bindForm.material }}</el-descriptions-item>
                 <el-descriptions-item label="重量" :labelStyle="{'text-align': 'center'}" :contentStyle="{'text-align': 'center'}">{{ bindForm.weight }}</el-descriptions-item>
               </el-descriptions>

src/views/basicData/product.vue

@@ -43,7 +43,7 @@
               <el-table-column type="index" label="序号" width="50" align="center"/>
               <el-table-column prop="name" label="产品名称" align="center" :show-overflow-tooltip="true"></el-table-column>
               <el-table-column prop="mfBizName" label="生产企业名称" align="center" :show-overflow-tooltip="true"></el-table-column>
-              <el-table-column prop="spec" label="规格尺寸" align="center"></el-table-column>
+              <el-table-column prop="spec" label="规格" align="center"></el-table-column>
               <el-table-column prop="material" label="材质" align="center"></el-table-column>
               <el-table-column prop="weight" label="重量" align="center"></el-table-column>
               <el-table-column label="操作" align="center" width="180">
@@ -71,7 +71,7 @@
           <el-card :style="'height:' + (height - 160) + 'px;overflow-y: auto;position:relative;'">
             <el-table :data="modelData">
               <el-table-column type="index" label="序号" width="50" align="center"/>
-              <el-table-column prop="spec" label="规格尺寸" align="center"></el-table-column>
+              <el-table-column prop="spec" label="规格" align="center"></el-table-column>
               <el-table-column prop="material" label="材质" align="center"></el-table-column>
               <el-table-column prop="weight" label="重量" align="center"></el-table-column>
               <el-table-column label="操作" align="center" width="180">
@@ -138,10 +138,10 @@
             </el-row>
             <el-row type="flex" justify="space-between">
               <el-col :span="11">
-                <el-form-item label="规格尺寸 :">
+                <el-form-item label="规格 :">
                   <el-input
                     clearable
-                    placeholder="请输入规格尺寸"
+                    placeholder="请输入规格"
                     v-model="formData.spec"
                   />
                 </el-form-item>
@@ -188,10 +188,10 @@
           <el-card>
             <el-row type="flex" justify="space-between">
               <el-col :span="11">
-                <el-form-item label="规格尺寸 :">
+                <el-form-item label="规格 :">
                   <el-input
                     clearable
-                    placeholder="请输入规格尺寸"
+                    placeholder="请输入规格"
                     v-model="specFormData.spec"
                   />
                 </el-form-item>
@@ -240,7 +240,9 @@ export default {
       specVisible: false,
       specTitle: '',
       specFormData: {},
-      formData: {},
+      formData: {
+        mfBizId: ''
+      },
       picUrl: '',
       modelData: [],
       mfBizList: [],
@@ -330,7 +332,6 @@ export default {
       const { data: res } = await this.$axios.get('/api/company')
       if (res.code != 99200) return this.$message.error(res.message)
       this.mfBizList = res.data
-      this.formData.mfBizId = res.data[0].bizId
     },
     editClick(row) {
       this.formData = {
@@ -392,7 +393,9 @@ export default {
       this.init()
     },
     dialogClose() {
-      this.formData = {}
+      this.formData = {
+        mfBizId: ''
+      }
       this.$refs.fromRef.resetFields()
     },
     specDialogClose() {
@@ -408,7 +411,9 @@ export default {
           if (!res.data) return this.$message.error(res.message)
           this.$message.success(res.message)
         } else {
+          if (this.formData.mfBizId) {
             this.formData.mfBizName = this.mfBizList.find(i => i.bizId == this.formData.mfBizId).name
+          }
           const { data: res } = await this.$axios.post(url, this.formData)
           if (!res.data) return this.$message.error(res.message)
           this.$message.success(res.message)