bug fix: 149,148,144

src/api/check.js

@@ -9,7 +9,7 @@ export function getInBoundCheckList (params) {
   })
 }
 
-// 产品检验列表
+// 物料检验列表
 export function getProductCheckList (params) {
   return request({
     url: request.adornUrl(`/biz-service/productionInspection/list`),

src/api/product.js

@@ -1,6 +1,6 @@
 import request from '@/utils/httpRequest'
 
-// 获取产品详情
+// 获取物料详情
 export function getProductDetail (id) {
   return request({
     url: request.adornUrl(`/biz-service/product/info/${id}`),
@@ -8,7 +8,7 @@ export function getProductDetail (id) {
   })
 }
 
-// 产品工艺列表(待完善)
+// 物料工艺列表(待完善)
 export function getTechList (param) {
   return request({
     url: request.adornUrl(`/biz-service/cusCustomer/list`),
@@ -17,7 +17,7 @@ export function getTechList (param) {
   })
 }
 
-// 产品列表
+// 物料列表
 export function getProductList (params) {
   return request({
     url: request.adornUrl(`/biz-service/product/list`),

src/api/production.js

@@ -103,7 +103,7 @@ export function getMouldDetail (mouldId) {
   })
 }
 
-// 根据产品ID查询步骤详情
+// 根据物料ID查询步骤详情
 export function getMouldDetailByProductId (productId) {
   return request({
     url: request.adornUrl(`/biz-service/ProdProductionMould/info/product/${productId}`),
@@ -111,7 +111,7 @@ export function getMouldDetailByProductId (productId) {
   })
 }
 
-// 获取未设置模板产品名称列表
+// 获取未设置模板物料名称列表
 export function getProductList () {
   return request({
     url: request.adornUrl(`/biz-service/ProdProductionMould/product/name/list`),

src/api/sale.js

@@ -120,7 +120,7 @@ export function getOutsourceDetail (id) {
   })
 }
 
-// 委外详情(按产品ID查询)
+// 委外详情(按物料ID查询)
 export function getOutsourceDetailByProId (id) {
   return request({
     url: request.adornUrl(`/biz-service/purCommDetail/info/${id}`),

src/api/trace.js

@@ -9,7 +9,7 @@ export function getOrderByCode (params) {
   })
 }
 
-// 根据产品编号追溯
+// 根据物料编号追溯
 export function getProductByCode (params) {
   return request({
     url: request.adornUrl(`/biz-service/trace/productionList`),
@@ -26,7 +26,7 @@ export function getOrderDetailById (orderId) {
   })
 }
 
-// 根据产品 Id 获取产品详情
+// 根据物料 Id 获取物料详情
 export function getProdInfoById (productionId) {
   return request({
     url: request.adornUrl(`/biz-service/trace/infoProdProductionId/${productionId}`),

src/views/modules/check/fc-detail.vue

@@ -8,8 +8,8 @@
         <div class="my-title">详情</div>
         <div style="margin-left: 20px;margin-right: 20px">
           <e-desc title="基本信息">
-            <e-desc-item label="产品名称">{{dataForm.productName}}</e-desc-item>
-            <e-desc-item label="产品编号">{{dataForm.prodCode}}</e-desc-item>
+            <e-desc-item label="物料名称">{{dataForm.productName}}</e-desc-item>
+            <e-desc-item label="物料编号">{{dataForm.prodCode}}</e-desc-item>
             <e-desc-item label="状态">{{dataForm.state?optionsStates.find(item => item.code === dataForm.state).value:''}}</e-desc-item>
 
             <e-desc-item label="工艺名称">{{dataForm.techName}}</e-desc-item>

src/views/modules/check/finish-check.vue

@@ -3,11 +3,11 @@
   <div class="check">
     <template v-if="!detailVisible">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="queryPage()">
-        <el-form-item label="产品名称" prop="productName">
-          <el-input v-model="dataForm.productName" placeholder="产品名称" clearable/>
+        <el-form-item label="物料名称" prop="productName">
+          <el-input v-model="dataForm.productName" placeholder="物料名称" clearable/>
         </el-form-item>
-        <el-form-item label="产品编号" prop="productNumber">
-          <el-input v-model="dataForm.productNumber" placeholder="产品编号" clearable/>
+        <el-form-item label="物料编号" prop="productNumber">
+          <el-input v-model="dataForm.productNumber" placeholder="物料编号" clearable/>
         </el-form-item>
         <el-form-item>
           <el-button @click="queryPage()">查询</el-button>
@@ -30,7 +30,7 @@
           align="center"
           min-width="160"
           :show-tooltip-when-overflow="true"
-          label="产品名称">
+          label="物料名称">
         </el-table-column>
         <el-table-column
           prop="prodCode"
@@ -38,7 +38,7 @@
           align="center"
           width="120"
           :show-tooltip-when-overflow="true"
-          label="产品编号">
+          label="物料编号">
         </el-table-column>
         <el-table-column
           prop="techName"

src/views/modules/check/ibc-export.vue

@@ -20,9 +20,9 @@
             <td colspan="3" style="width: 40%">{{dataForm.batchNumber}}</td>
           </tr>
           <tr>
-            <td class="title" style="width: 15%">产品名称</td>
+            <td class="title" style="width: 15%">物料名称</td>
             <td colspan="2"  style="width: 30%">{{dataForm.materialName}}</td>
-            <td class="title" style="width: 15%">产品图号</td>
+            <td class="title" style="width: 15%">物料图号</td>
             <td colspan="3" style="width: 40%">{{dataForm.specifications}}</td>
           </tr>
           <tr>

src/views/modules/check/pc-detail.vue

@@ -8,8 +8,8 @@
         <div class="my-title">详情</div>
         <div style="margin-left: 20px;margin-right: 20px">
           <e-desc title="基本信息">
-            <e-desc-item label="产品名称">{{dataForm.productName}}</e-desc-item>
-            <e-desc-item label="产品编号">{{dataForm.prodCode}}</e-desc-item>
+            <e-desc-item label="物料名称">{{dataForm.productName}}</e-desc-item>
+            <e-desc-item label="物料编号">{{dataForm.prodCode}}</e-desc-item>
             <e-desc-item label="状态">{{dataForm.state?optionsStates.find(item => item.code === dataForm.state).value:''}}</e-desc-item>
 
             <e-desc-item label="工艺名称">{{dataForm.techName}}</e-desc-item>

src/views/modules/check/product-check.vue

@@ -3,11 +3,11 @@
   <div class="check">
     <template v-if="!detailVisible">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="queryPage()">
-        <el-form-item label="产品名称" prop="productName">
-          <el-input v-model="dataForm.productName" placeholder="产品名称" clearable/>
+        <el-form-item label="物料名称" prop="productName">
+          <el-input v-model="dataForm.productName" placeholder="物料名称" clearable/>
         </el-form-item>
-        <el-form-item label="产品编号" prop="productNumber">
-          <el-input v-model="dataForm.productNumber" placeholder="产品编号" clearable/>
+        <el-form-item label="物料编号" prop="productNumber">
+          <el-input v-model="dataForm.productNumber" placeholder="物料编号" clearable/>
         </el-form-item>
         <el-form-item>
           <el-button @click="queryPage()">查询</el-button>
@@ -30,7 +30,7 @@
           align="center"
           min-width="160"
           :show-tooltip-when-overflow="true"
-          label="产品名称">
+          label="物料名称">
         </el-table-column>
         <el-table-column
           prop="prodCode"
@@ -38,7 +38,7 @@
           align="center"
           width="140"
           :show-tooltip-when-overflow="true"
-          label="产品编号">
+          label="物料编号">
         </el-table-column>
         <el-table-column
           prop="techName"

src/views/modules/cus/communicate-add-or-update.vue

@@ -566,7 +566,7 @@ export default {
           // }
           // if (this.dataForm.coType === "1") {
           //   if (this.cusRCommProductVOS.length === 0) {
-          //     this.$message.error("请选择任务单产品明细");
+          //     this.$message.error("请选择任务单物料明细");
           //     return;
           //   }
           // }
@@ -605,7 +605,7 @@ export default {
         this.$refs.inbound.init(1)
       })
     },
-    // 编辑产品项
+    // 编辑物料项
     updateProductHandle (row) {
       this.inboundVisible = true
       this.$nextTick(() => {
@@ -654,7 +654,7 @@ export default {
     typeChanged (item) {
       this.detailVisible = item === '1'
     },
-    // 删除产品项
+    // 删除物料项
     deleteProductHandle (recordId) {
       this.cusRCommProductVOS.splice(
         this.cusRCommProductVOS.findIndex((item) => item.recordId === recordId),

src/views/modules/cus/contract-add-or-update.vue

@@ -91,11 +91,11 @@
 
         <el-row class="my-row my-bg">
           <div class="title">
-            与产品有关要求的明确性、符合性：
+            与物料有关要求的明确性、符合性：
           </div>
           <div class="item">
             <div class="msage">
-              1、顾客对产品的要求与潜在要求是否明确
+              1、顾客对物料的要求与潜在要求是否明确
             </div>
             <el-radio v-model="dataForm.part11" :label="1">是</el-radio>
             <el-radio v-model="dataForm.part11" :label="0">否</el-radio>
@@ -115,7 +115,7 @@
           </div>
           <div class="item">
             <div class="msage">
-              1、图样和技术要求能否满足生产要求，产品服务和培训能否满足要求
+              1、图样和技术要求能否满足生产要求，物料服务和培训能否满足要求
             </div>
             <el-radio v-model="dataForm.part21" :label="1">是</el-radio>
             <el-radio v-model="dataForm.part21" :label="0">否</el-radio>
@@ -155,7 +155,7 @@
             满足规定要求的能力：
           </div>
           <div class="item">
-              项目组对履行承诺的风险（包括技术、质量、生产能力、进度、经费）识别：   
+              项目组对履行承诺的风险（包括技术、质量、生产能力、进度、经费）识别：
             <el-radio v-model="dataForm.part31" :label="1">高</el-radio>
             <el-radio v-model="dataForm.part31" :label="2">中</el-radio>
             <el-radio v-model="dataForm.part31" :label="3">低</el-radio>
@@ -358,7 +358,7 @@
 }
 .msage{
   display: inline-table;
-  min-width: 500px;    
+  min-width: 500px;
 }
 .my-bg{
   border-radius: 4px;

src/views/modules/cus/contract-detail.vue

@@ -35,13 +35,13 @@
         <e-desc-item label="客户名称">{{dataForm.customerName}}</e-desc-item>
         <e-desc-item label="联系人" span="2">{{dataForm.bizManagerName}}</e-desc-item>
         <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
-        <e-desc-item label="与产品有关要求的明确性、符合性" span="3">
-          1、顾客对产品的要求与潜在要求是否明确 -- {{ dataForm.part11 ? '是' : '否' }}
+        <e-desc-item label="与物料有关要求的明确性、符合性" span="3">
+          1、顾客对物料的要求与潜在要求是否明确 -- {{ dataForm.part11 ? '是' : '否' }}
           <br>
           2、合同的合法性、完性整性、规范性 -- {{ dataForm.part12 ? '是' : '否' }}
         </e-desc-item>
         <e-desc-item label="风险控制能力" span="3">
-          1、图样和技术要求能否满足生产要求，产品服务和培训能否满足要求 -- {{ dataForm.part21 ? '是' : '否' }}
+          1、图样和技术要求能否满足生产要求，物料服务和培训能否满足要求 -- {{ dataForm.part21 ? '是' : '否' }}
           <br>
           2、外购器材风险的控制情况，能否保障生产 -- {{ dataForm.part22 ? '是' : '否' }}
           <br>

src/views/modules/cus/contract-record-add-or-update.vue

@@ -52,7 +52,7 @@
             </el-form-item>
           </el-row>
           <el-row v-if="isProductListVisible">
-            <div class="title"><span style="color: red">*</span> 产品列表</div>
+            <div class="title"><span style="color: red">*</span> 物料列表</div>
             <el-table
               :data="productList"
               border
@@ -69,7 +69,7 @@
                 align="center"
                 min-width="120"
                 :show-tooltip-when-overflow="true"
-                label="产品名称">
+                label="物料名称">
               </el-table-column>
               <el-table-column
                 prop="productSpecifications"
@@ -187,9 +187,9 @@ export default {
         optionsReCode: [],
         fileList: [],
         dataList: [],
-        isProductListVisible: false, // 产品列表是否显示
-        productUpdateVisible: false, // 产品修改对话框是否显示
-        inboundVisible: false, // 产品新增对话框是否显示
+        isProductListVisible: false, // 物料列表是否显示
+        productUpdateVisible: false, // 物料修改对话框是否显示
+        inboundVisible: false, // 物料新增对话框是否显示
         productList: [],
         id: 0,
         dataForm: {},
@@ -265,11 +265,11 @@ export default {
               return
             }
             if (this.productList.length === 0) {
-              this.$message.error('请选择任务单产品明细')
+              this.$message.error('请选择任务单物料明细')
               return
             }
             this.dataForm.cusCBookProducts = this.productList
-            // 产品明细
+            // 物料明细
             this.$http({
               url: this.$http.adornUrl(`/biz-service/cusContractBook/${!this.id ? 'save' : 'update'}`),
               method: 'post',
@@ -292,18 +292,18 @@ export default {
           }
         })
       },
-      // 删除产品项
+      // 删除物料项
       deleteProductHandle (recordId) {
         this.productList.splice(this.productList.findIndex((item) => item.recordId === recordId), 1)
       },
-      // 编辑产品
+      // 编辑物料
       updateProductHandle (row) {
         this.productUpdateVisible = true
         this.$nextTick(() => {
           this.$refs.productDialog.init(1, row)
         })
       },
-      // 添加产品
+      // 添加物料
       addProductHandle () {
         this.productUpdateVisible = true
         this.$nextTick(() => {

src/views/modules/cus/contract-record-detail.vue

@@ -16,7 +16,7 @@
           </div>
         </e-desc-item>
       </e-desc>
-      <e-desc title="产品列表">
+      <e-desc title="物料列表">
         <el-table
           :data="dataForm.cusCBookProducts"
           border
@@ -33,7 +33,7 @@
             align="center"
             min-width="120"
             :show-tooltip-when-overflow="true"
-            label="产品名称">
+            label="物料名称">
           </el-table-column>
           <el-table-column
             prop="productSpecifications"

src/views/modules/cus/contract-record-product-add-or-update.vue

@@ -8,8 +8,8 @@
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
       <el-row class="my-row">
         <el-col :span="8">
-          <el-form-item label="产品名称" prop="productName">
-            <el-input v-model="dataForm.productName" placeholder="产品名称"></el-input>
+          <el-form-item label="物料名称" prop="productName">
+            <el-input v-model="dataForm.productName" placeholder="物料名称"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8" style="padding-left: 10px">
@@ -62,7 +62,7 @@ export default {
         rate: 1
       },
       dataRule: {
-        productName: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
+        productName: [{ required: true, message: '物料名称不能为空', trigger: 'blur' }],
         cnt: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
         price: [{ required: true, message: '含税单价不能为空', trigger: 'blur' }],
         rate: [{ required: true, message: '税率不能为空', trigger: 'blur' }]

src/views/modules/cus/contract-record.vue

@@ -289,7 +289,7 @@ export default {
         this.$refs.changeForm.init(id)
       })
     },
-    // 转换属性“产品类别”
+    // 转换属性“物料类别”
     typeFormat (row) {
       if (this.optionsType) {
         for (let i = 0; i < this.optionsType.length; i++) {
@@ -313,7 +313,7 @@ export default {
         this.$refs.noticeChangeSetting.init()
       })
     },
-    // 产品更改通知单
+    // 物料更改通知单
     changeDetails (row) {
       this.changeAttachVisible = true
       this.$nextTick(() => {

src/views/modules/home/admin.vue

@@ -37,7 +37,7 @@
           <div class="box-stat-number">
             <div class="stat-number">
               <div class="item">
-                <div class="title">在制产品总数</div>
+                <div class="title">在制物料总数</div>
                 <div class="number">{{ produceCensus.produceNum }}</div>
               </div>
               <div class="item">
@@ -72,11 +72,11 @@
                 ></el-table-column>
                 <el-table-column
                   prop="productName"
-                  label="产品名称"
+                  label="物料名称"
                 ></el-table-column>
                 <el-table-column
                   prop="prodCode"
-                  label="产品编号"
+                  label="物料编号"
                 ></el-table-column>
                 <el-table-column
                   prop="batchNo"
@@ -204,7 +204,7 @@
                   <el-table-column type="index" label="序号"></el-table-column>
                   <el-table-column
                     prop="productName"
-                    label="产品"
+                    label="物料"
                   ></el-table-column>
                   <el-table-column
                     prop="prodCode"
@@ -251,7 +251,7 @@
                   ></el-table-column>
                   <el-table-column
                     prop="taskName"
-                    label="产品名字"
+                    label="物料名字"
                   ></el-table-column>
                   <el-table-column
                     prop="endTime"
@@ -366,7 +366,7 @@ export default {
       submittedRecordListTimer: null,
       // 生产统计
       produceCensus: {
-        produceNum: 0, // 在制产品总数
+        produceNum: 0, // 在制物料总数
         completeNum: 0, // 已完成数量
         damageNum: 0, // 损坏数量
         totalOutputValue: 0 // 生产总值

src/views/modules/home/customer.vue

@@ -13,7 +13,7 @@
             </el-row>
             <el-row :span="24" class="bg1-1-2">
               <div class="box-custom-number">
-                <div class="custom-number">在制产品数：{{ produceCensus.produceNum }}</div>
+                <div class="custom-number">在制物料数：{{ produceCensus.produceNum }}</div>
               </div>
             </el-row>
             <el-row :span="24" class="bg1-1-1">
@@ -39,7 +39,7 @@
               <div class="box-stat-number">
                 <div class="stat-number">
                   <div class="item">
-                    <div class="title">在制产品总数</div>
+                    <div class="title">在制物料总数</div>
                     <div class="number">{{ produceCensus.produceNum }}</div>
                   </div>
                   <div class="item">
@@ -129,7 +129,7 @@
                           ></el-table-column>
                           <el-table-column
                             prop="productName"
-                            label="产品"
+                            label="物料"
                           ></el-table-column>
                           <el-table-column
                             prop="prodCode"
@@ -172,11 +172,11 @@
                 ></el-table-column>
                 <el-table-column
                   prop="productName"
-                  label="产品名称"
+                  label="物料名称"
                 ></el-table-column>
                 <el-table-column
                   prop="prodCode"
-                  label="产品编号"
+                  label="物料编号"
                 ></el-table-column>
                 <el-table-column
                   prop="batchNo"
@@ -227,7 +227,7 @@
                   ></el-table-column>
                   <el-table-column
                     prop="taskName"
-                    label="产品名字"
+                    label="物料名字"
                   ></el-table-column>
                   <el-table-column
                     prop="endTime"
@@ -300,7 +300,7 @@ export default {
       submittedRecordListTimer: null,
       // 生产统计
       produceCensus: {
-        produceNum: 0, // 在制产品总数
+        produceNum: 0, // 在制物料总数
         completeNum: 0, // 已完成数量
         damageNum: 0, // 损坏数量
         totalOutputValue: 0 // 生产总值

src/views/modules/msg-center/approve.vue

@@ -193,7 +193,7 @@
             code: 'pro_technology_flow', value: '工艺评审'
           },
           {
-            code: 'pro_product_flow', value: '产品评审'
+            code: 'pro_product_flow', value: '物料评审'
           },
           {
             code: 'wh_inventory_record_flow', value: '盘点评审'

src/views/modules/order/dispatch.vue

@@ -45,7 +45,7 @@
           align="center"
           min-width="140"
           :show-tooltip-when-overflow="true"
-          label="产品编号">
+          label="物料编号">
         </el-table-column>
         <el-table-column
           prop="productName"
@@ -53,7 +53,7 @@
           align="center"
           min-width="140"
           :show-tooltip-when-overflow="true"
-          label="产品名称">
+          label="物料名称">
         </el-table-column>
         <el-table-column
           prop="orderDeliveryDate"

src/views/modules/order/order-add-or-update.vue

@@ -487,21 +487,21 @@
       salesmanChanged (val) {
         this.dataForm.salesmanId = val
       },
-      // 添加任务单产品明细
+      // 添加任务单物料明细
       addProductHandle () {
         this.productListVisible = true
         this.$nextTick(() => {
           this.$refs.productList.init(2)
         })
       },
-      // 编辑产品项
+      // 编辑物料项
       updateProductHandle (row) {
         this.productListVisible = true
         this.$nextTick(() => {
           this.$refs.productList.init(2, row, this.addType)
         })
       },
-      // 删除产品项
+      // 删除物料项
       deleteProductHandle (recordId) {
         this.productDetails.splice(this.productDetails.findIndex((item) => item.recordId === recordId), 1)
       },

src/views/modules/order/order-detail.vue

@@ -299,7 +299,7 @@ export default {
             if (data.data.workFlowBusinessExt.processLogList) {
               dealStepLogs(data.data.workFlowBusinessExt.processLogList, this.logList)
             }
-            // 任务单产品明细
+            // 任务单物料明细
             if (data.data.saleROrderProductList) {
               this.productDetails = data.data.saleROrderProductList
             }

src/views/modules/product/template-add-or-update-v2.vue

@@ -71,7 +71,7 @@
       onChose () {
         this.visible = false
       },
-      // 初始化：type: 1 沟通产品明细/合同台账产品明细，2 任务单产品明细
+      // 初始化：type: 1 沟通物料明细/合同台账物料明细，2 任务单物料明细
       init (type, dataForm, techType) {
         this.bizType = techType ? 3 : type
         if (dataForm) {

src/views/modules/product/template-add-or-update.vue

@@ -103,7 +103,7 @@
       onChose () {
         this.visible = false
       },
-      // 初始化：type: 1 沟通产品明细/合同台账产品明细，2 任务单产品明细
+      // 初始化：type: 1 沟通物料明细/合同台账物料明细，2 任务单物料明细
       init (type, dataForm, techType) {
         this.bizType = techType ? 3 : type
         if (dataForm) {

src/views/modules/product/template-chose-material.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="选择产品配料清单"
+    title="选择物料配料清单"
     width="70%"
     :close-on-click-modal="false"
     :visible.sync="visible">

src/views/modules/product/template-chose.vue

@@ -1,12 +1,12 @@
 <template>
   <el-dialog
-    title="选择产品"
+    title="选择物料"
     width="70%"
     :close-on-click-modal="false"
     :visible.sync="visible">
     <div class="stock-order">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="search()">
-        <el-form-item label="产品名称">
+        <el-form-item label="物料名称">
           <el-input v-model="dataForm.name" placeholder="名称" clearable></el-input>
         </el-form-item>
         <el-form-item>
@@ -34,19 +34,19 @@
           prop="productCode"
           header-align="center"
           align="center"
-          label="产品编码">
+          label="物料编码">
         </el-table-column>
         <el-table-column
           prop="productName"
           header-align="center"
           align="center"
-          label="产品名称">
+          label="物料名称">
         </el-table-column>
         <el-table-column
           prop="productTypeValue"
           header-align="center"
           align="center"
-          label="产品类别">
+          label="物料类别">
         </el-table-column>
 <!--        <el-table-column-->
 <!--          prop="delFlag"-->
@@ -58,7 +58,7 @@
           prop="productSpec"
           header-align="center"
           align="center"
-          label="产品规格">
+          label="物料规格">
         </el-table-column>
         <el-table-column
           prop="notes"
@@ -147,7 +147,7 @@
       },
       addItems () {
         if (this.dataListSelections.length === 0) {
-          this.$message.warning('请选择产品')
+          this.$message.warning('请选择物料')
           return
         }
         this.visible = false

src/views/modules/production/damage-details.vue

@@ -29,8 +29,8 @@
         <approve-component ref="approve" @approveFinished="approveFinished"/>
       </div>
       <e-desc title="基本信息" column="3">
-        <e-desc-item label="产品名称">{{dataForm.productName}}</e-desc-item>
-        <e-desc-item label="产品编号">{{dataForm.prodCode}}</e-desc-item>
+        <e-desc-item label="物料名称">{{dataForm.productName}}</e-desc-item>
+        <e-desc-item label="物料编号">{{dataForm.prodCode}}</e-desc-item>
         <e-desc-item label="状态">{{formatState(dataForm)}}</e-desc-item>
 
         <e-desc-item label="任务单编码">{{dataForm.orderCode}}</e-desc-item>

src/views/modules/production/damage.vue

@@ -3,14 +3,14 @@
   <div>
     <template v-if="!detailVisible">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="queryPage()">
-        <el-form-item label="产品名称">
-          <el-input v-model="dataForm.name" placeholder="产品名称" clearable/>
+        <el-form-item label="物料名称">
+          <el-input v-model="dataForm.name" placeholder="物料名称" clearable/>
         </el-form-item>
         <el-form-item label="合同号">
           <el-input v-model="dataForm.orderCode" placeholder="合同号" clearable/>
         </el-form-item>
-        <el-form-item label="产品编号">
-          <el-input v-model="dataForm.prodCode" placeholder="产品编号" clearable/>
+        <el-form-item label="物料编号">
+          <el-input v-model="dataForm.prodCode" placeholder="物料编号" clearable/>
         </el-form-item>
         <el-form-item>
           <el-button @click="queryPage()">查询</el-button>
@@ -33,7 +33,7 @@
           align="center"
           width="160"
           :show-overflow-tooltip="true"
-          label="产品名称">
+          label="物料名称">
         </el-table-column>
         <el-table-column
           prop="prodCode"
@@ -41,7 +41,7 @@
           align="center"
           width="160"
           :show-overflow-tooltip="true"
-          label="产品编号">
+          label="物料编号">
         </el-table-column>
         <el-table-column
           prop="orderCode"

src/views/modules/production/monitoring-details.vue

@@ -16,7 +16,7 @@
       >
         <el-row class="my-row">
           <el-col :span="8">
-            <el-form-item label="产品编号：">
+            <el-form-item label="物料编号：">
               <el-input v-model="dataForm.prodCode" disabled></el-input>
             </el-form-item>
           </el-col>

src/views/modules/production/monitoring.vue

@@ -6,12 +6,12 @@
         <el-form-item label="合同号">
           <el-input v-model="dataForm.orderCode" placeholder="合同号" clearable/>
         </el-form-item>
-        <el-form-item label="产品名称">
-          <el-input v-model="dataForm.productName" placeholder="产品名称" clearable/>
+        <el-form-item label="物料名称">
+          <el-input v-model="dataForm.productName" placeholder="物料名称" clearable/>
         </el-form-item>
         <el-form-item>
           <el-button @click="queryPage()">查询</el-button>
-          <el-button v-if="false" type="primary" disabled @click="createNewProduct()">创建新产品</el-button>
+          <el-button v-if="false" type="primary" disabled @click="createNewProduct()">创建新物料</el-button>
         </el-form-item>
       </el-form>
       <el-table
@@ -31,7 +31,7 @@
           align="center"
           min-width="100"
           :show-tooltip-when-overflow="true"
-          label="产品编号">
+          label="物料编号">
         </el-table-column>
         <el-table-column
           prop="productName"
@@ -39,7 +39,7 @@
           align="center"
           min-width="160"
           :show-tooltip-when-overflow="true"
-          label="产品名称">
+          label="物料名称">
         </el-table-column>
         <el-table-column
           prop="progressBar"
@@ -199,7 +199,7 @@
           this.$refs.details.init(id, prodCode, disable)
         })
       },
-      // 创建新产品
+      // 创建新物料
       createNewProduct () {
         this.$message.warning('功能暂未开放')
       },

src/views/modules/production/recording.vue

@@ -6,8 +6,8 @@
         <el-form-item label="合同号">
           <el-input v-model="dataForm.orderCode" placeholder="合同号" clearable/>
         </el-form-item>
-        <el-form-item label="产品名称">
-          <el-input v-model="dataForm.productName" placeholder="产品名称" clearable/>
+        <el-form-item label="物料名称">
+          <el-input v-model="dataForm.productName" placeholder="物料名称" clearable/>
         </el-form-item>
         <el-form-item>
           <el-button @click="queryPage()">查询</el-button>
@@ -30,7 +30,7 @@
           align="center"
           min-width="140"
           :show-tooltip-when-overflow="true"
-          label="产品名称">
+          label="物料名称">
         </el-table-column>
         <el-table-column
           prop="prodCode"
@@ -38,7 +38,7 @@
           align="center"
           min-width="100"
           :show-tooltip-when-overflow="true"
-          label="产品编号">
+          label="物料编号">
         </el-table-column>
         <el-table-column
           prop="orderCode"

src/views/modules/production/scheduling-mould-details.vue

@@ -16,7 +16,7 @@
       >
         <el-row class="my-row" :gutter="20">
           <el-col :span="8">
-            <el-form-item label="产品" prop="productId">
+            <el-form-item label="物料" prop="productId">
               <el-input v-if="disable && productName" :disabled="disable" v-model="productName"></el-input>
               <el-select
                 v-else
@@ -117,7 +117,7 @@ export default {
     onChose () {
       this.$emit('onChose')
     },
-    // 初始化产品名称列表
+    // 初始化物料名称列表
     async initProductList () {
       getProductList().then(({ data }) => {
         if (data && data.code === '200') {
@@ -155,9 +155,9 @@ export default {
       //   this.productChange(productionId)
       // }
     },
-    // 根据产品ID查询步骤详情
+    // 根据物料ID查询步骤详情
     async productChange (productId) {
-      this.$confirm('选中后不可更改，是否选择该产品？', '提示', {
+      this.$confirm('选中后不可更改，是否选择该物料？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/modules/production/scheduling-mould.vue

@@ -3,8 +3,8 @@
   <div class="production">
     <template v-if="!detailsVisible && !detailsVisible">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="queryPage()">
-        <el-form-item label="产品名称">
-          <el-input v-model="dataForm.productName" placeholder="产品名称" clearable/>
+        <el-form-item label="物料名称">
+          <el-input v-model="dataForm.productName" placeholder="物料名称" clearable/>
         </el-form-item>
         <el-form-item label="模板名称">
           <el-input v-model="dataForm.mouldName" placeholder="模板名称" clearable/>
@@ -39,7 +39,7 @@
           align="center"
           min-width="120"
           :show-tooltip-when-overflow="true"
-          label="产品名称">
+          label="物料名称">
         </el-table-column>
         <el-table-column
           prop="creatorName"

src/views/modules/production/scheduling-outsource.vue

@@ -37,7 +37,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <div class="title"><span style="color: red">*</span> 委外产品明细</div>
+          <div class="title"><span style="color: red">*</span> 委外物料明细</div>
           <el-row class="my-row">
             <el-table
               :data="productDetails"
@@ -60,7 +60,7 @@
                 align="center"
                 width="140"
                 :show-tooltip-when-overflow="true"
-                label="产品名称">
+                label="物料名称">
               </el-table-column>
               <el-table-column
                 prop="prodCode"
@@ -68,7 +68,7 @@
                 align="center"
                 width="120"
                 :show-tooltip-when-overflow="true"
-                label="产品编号">
+                label="物料编号">
               </el-table-column>
               <el-table-column
                 prop="productSpec"
@@ -307,7 +307,7 @@ export default {
             } else {
               action = `/biz-service/purCommDetail/${!this.id ? 'save' : 'update'}`
             }
-            // 产品明细
+            // 物料明细
             this.$http({
               url: this.$http.adornUrl(action),
               method: 'post',

src/views/modules/purchase/outsource-chose.vue

@@ -44,7 +44,7 @@
           align="center"
           width="160"
           :show-tooltip-when-overflow="true"
-          label="产品名称">
+          label="物料名称">
         </el-table-column>
         <el-table-column
           prop="specificationExplian"

src/views/modules/sale/add-product.vue

@@ -8,13 +8,13 @@
       <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="100px">
         <el-row class="my-row">
           <el-col :span="8">
-            <el-form-item label="产品名称" prop="productName">
-              <el-input v-model="dataForm.productName" :disabled="true" placeholder="产品名称"></el-input>
+            <el-form-item label="物料名称" prop="productName">
+              <el-input v-model="dataForm.productName" :disabled="true" placeholder="物料名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="产品编号" prop="prodCode">
-              <el-input v-model="dataForm.prodCode" :disabled="true" placeholder="产品编号"></el-input>
+            <el-form-item label="物料编号" prop="prodCode">
+              <el-input v-model="dataForm.prodCode" :disabled="true" placeholder="物料编号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -133,8 +133,8 @@
         id: 0,
         taxRateVal: 0,
         dataRule: {
-          productName: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
-          prodCode: [{ required: true, message: '产品编号不能为空', trigger: 'blur' }],
+          productName: [{ required: true, message: '物料名称不能为空', trigger: 'blur' }],
+          prodCode: [{ required: true, message: '物料编号不能为空', trigger: 'blur' }],
           productSpec: [{ required: true, message: '型号规格不能为空', trigger: 'blur' }],
           batchNumber: [{ required: true, message: '批次号不能为空', trigger: 'blur' }],
           specificationExplian: [{ required: true, message: '要求说明不能为空', trigger: 'blur' }],

src/views/modules/sale/contract-add-or-update.vue

@@ -224,7 +224,7 @@
                 align="center"
                 min-width="140"
                 :show-tooltip-when-overflow="true"
-                label="产品名称">
+                label="物料名称">
               </el-table-column>
               <el-table-column
                 prop="prodCode"
@@ -232,7 +232,7 @@
                 align="center"
                 min-width="120"
                 :show-tooltip-when-overflow="true"
-                label="产品编号">
+                label="物料编号">
               </el-table-column>
               <el-table-column
                 prop="commissionTypeName"
@@ -478,7 +478,7 @@ export default {
               this.$message.error('请上传文件')
               return
             }
-            // 产品明细
+            // 物料明细
             // console.log(JSON.stringify(this.materialList))
             this.dataForm.purPurchaseContractDetailsList = []
             if (Number(this.contactType) === 1) {

src/views/modules/sale/contract-detail.vue

@@ -142,7 +142,7 @@
             align="center"
             min-width="140"
             :show-tooltip-when-overflow="true"
-            label="产品名称">
+            label="物料名称">
           </el-table-column>
           <el-table-column
             prop="prodCode"
@@ -150,7 +150,7 @@
             align="center"
             min-width="120"
             :show-tooltip-when-overflow="true"
-            label="产品编号">
+            label="物料编号">
           </el-table-column>
           <el-table-column
             prop="specificationExplian"

src/views/modules/sale/contract.vue

@@ -291,7 +291,7 @@ export default {
         this.$refs.noticeChangeSetting.init()
       })
     },
-    // 产品更改通知单
+    // 物料更改通知单
     changeDetails (row) {
       this.changeAttachVisible = true
       this.$nextTick(() => {

src/views/modules/sale/outsource-add-or-update.vue

@@ -37,7 +37,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <div class="title"><span style="color: red">*</span> 委外产品明细</div>
+          <div class="title"><span style="color: red">*</span> 委外物料明细</div>
           <el-row class="my-row">
             <el-table
               :data="productDetails"
@@ -59,14 +59,14 @@
                 header-align="center"
                 align="center"
                 min-width="120"
-                label="产品名称">
+                label="物料名称">
               </el-table-column>
               <el-table-column
                 prop="prodCode"
                 header-align="center"
                 align="center"
                 min-width="120"
-                label="产品编号">
+                label="物料编号">
               </el-table-column>
               <el-table-column
                 prop="productSpec"
@@ -310,7 +310,7 @@ export default {
             } else {
               action = `/biz-service/purCommDetail/${!this.id ? 'save' : 'update'}`
             }
-            // 产品明细
+            // 物料明细
             this.$http({
               url: this.$http.adornUrl(action),
               method: 'post',

src/views/modules/sale/outsource-detail.vue

@@ -38,7 +38,7 @@
 
 <!--        <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>-->
       </e-desc>
-      <e-desc title="委外产品明细">
+      <e-desc title="委外物料明细">
         <el-table
           :data="dataForm.purCommissionDetails"
           border
@@ -60,7 +60,7 @@
             align="center"
             min-width="120"
             :show-tooltip-when-overflow="true"
-            label="产品名称">
+            label="物料名称">
           </el-table-column>
           <el-table-column
             prop="prodCode"
@@ -68,7 +68,7 @@
             align="center"
             min-width="120"
             :show-tooltip-when-overflow="true"
-            label="产品编号">
+            label="物料编号">
           </el-table-column>
           <el-table-column
             prop="productSpec"

src/views/modules/sale/outsource.vue

@@ -17,7 +17,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="名称或说明" prop="goodsName">
-          <el-input v-model="dataForm.goodsName" placeholder="产品名称" clearable/>
+          <el-input v-model="dataForm.goodsName" placeholder="物料名称" clearable/>
         </el-form-item>
         <el-form-item label="申请日期">
           <el-date-picker
@@ -74,7 +74,7 @@
           align="center"
           min-width="140"
           :show-tooltip-when-overflow="true"
-          label="产品名称">
+          label="物料名称">
         </el-table-column>
         <el-table-column
           prop="prodCode"
@@ -82,7 +82,7 @@
           align="center"
           min-width="120"
           :show-tooltip-when-overflow="true"
-          label="产品编号">
+          label="物料编号">
         </el-table-column>
         <el-table-column
           prop="commissionTypeName"
@@ -435,7 +435,7 @@ export default {
         this.$refs.noticeChangeSetting.init()
       })
     },
-    // 产品更改通知单
+    // 物料更改通知单
     changeDetails (row) {
       this.changeAttachVisible = true
       this.$nextTick(() => {

src/views/modules/sale/supplier-add-or-update.vue

@@ -65,8 +65,8 @@
             </el-col>
           </el-row>
           <el-row class="my-row" style="margin-top: 20px">
-            <el-form-item label="公司产品介绍" prop="prodIntroduce">
-              <el-input type="textarea" v-model="dataForm.prodIntroduce" :disabled="type === 3" placeholder="公司产品介绍"/>
+            <el-form-item label="公司物料介绍" prop="prodIntroduce">
+              <el-input type="textarea" v-model="dataForm.prodIntroduce" :disabled="type === 3" placeholder="公司物料介绍"/>
             </el-form-item>
           </el-row>
           <el-row>

src/views/modules/sale/supplier-detail.vue

@@ -36,7 +36,7 @@
         <e-desc-item label="网址">{{dataForm.url}}</e-desc-item>
         <e-desc-item label="邮箱" span="2">{{dataForm.supplierEmail}}</e-desc-item>
 
-        <e-desc-item label="公司产品介绍" span="3">{{dataForm.prodIntroduce}}</e-desc-item>
+        <e-desc-item label="公司物料介绍" span="3">{{dataForm.prodIntroduce}}</e-desc-item>
       </e-desc>
       <e-desc title="财务信息" column="3">
         <e-desc-item label="企业税号">{{dataForm.taxNumber}}</e-desc-item>

src/views/modules/tech-manage/material-tech-add-or-update.vue

@@ -155,7 +155,7 @@ export default {
     dataFormSubmit () {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          // 产品技术文件
+          // 物料技术文件
           let fList = this.fileList
           if (fList.length > 0) {
             this.dataForm.attachList = []

src/views/modules/tech-manage/material-tech-detail.vue

@@ -108,7 +108,7 @@ export default {
     dataFormSubmit () {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          // 产品技术文件
+          // 物料技术文件
           let fList = this.fileList
           if (fList.length > 0) {
             this.dataForm.attachList = []

src/views/modules/tech-manage/material-tech.vue

@@ -6,7 +6,7 @@
         <el-form-item label="名称">
           <el-input
             v-model="dataForm.optionName"
-            placeholder="请输入产品名称"
+            placeholder="请输入物料名称"
             clearable
           />
         </el-form-item>

src/views/modules/tech-manage/process-manage.vue

@@ -13,7 +13,7 @@
         <el-form-item label="名称">
           <el-input
             v-model="dataForm.name"
-            placeholder="请输入产品名称"
+            placeholder="请输入物料名称"
             clearable
           />
         </el-form-item>
@@ -355,4 +355,4 @@ export default {
 </script>
 
 <style scoped>
-</style>
+</style>

src/views/modules/tech/crafts-detail.vue

@@ -33,7 +33,7 @@
       <e-desc title="基本信息" column="3">
         <e-desc-item label="工艺名称">{{ dataForm.techName }}</e-desc-item>
         <e-desc-item label="工艺版本">{{ dataForm.techVersion }}</e-desc-item>
-        <e-desc-item label="产品">{{ dataForm.productName }}</e-desc-item>
+        <e-desc-item label="物料">{{ dataForm.productName }}</e-desc-item>
 
         <e-desc-item label="备注" span="3">{{ dataForm.notes }}</e-desc-item>
       </e-desc>

src/views/modules/tech/crafts-management.vue

@@ -6,7 +6,7 @@
         <el-form-item label="工艺名称">
           <el-input v-model="dataForm.techName" clearable/>
         </el-form-item>
-        <el-form-item label="产品名称">
+        <el-form-item label="物料名称">
           <el-input v-model="dataForm.productName" clearable/>
         </el-form-item>
         <el-form-item label="状态">
@@ -75,7 +75,7 @@
           align="center"
           min-width="140"
           :show-tooltip-when-overflow="true"
-          label="产品名称">
+          label="物料名称">
         </el-table-column>
         <el-table-column
           prop="createTime"

src/views/modules/tech/ctafts-add-or-detail.vue

@@ -27,7 +27,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="产品" prop="productId">
+            <el-form-item label="物料" prop="productId">
               <el-select
                 v-model="dataForm.productId"
                 :disabled="display || isEdit"
@@ -148,7 +148,7 @@ export default {
           { required: true, message: '工艺版本不能为空', trigger: 'blur' }
         ],
         productId: [
-          { required: true, message: '产品不能为空', trigger: 'change' }
+          { required: true, message: '物料不能为空', trigger: 'change' }
         ]
       },
       dataRule1: {

src/views/modules/tech/draw-management.vue

@@ -16,7 +16,7 @@
             end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="产品" prop="productId">
+        <el-form-item label="物料" prop="productId">
           <product-component v-model="dataForm.productId" :product-id.sync="dataForm.productId"></product-component>
         </el-form-item>
         <el-form-item>
@@ -73,7 +73,7 @@
           align="center"
           min-width="140"
           :show-tooltip-when-overflow="true"
-          label="对应产品">
+          label="对应物料">
         </el-table-column>
         <el-table-column
           prop="source"

src/views/modules/tech/product-add-or-update.vue

@@ -132,18 +132,18 @@
         </el-row>
       </el-row>
       <el-row class="my-row">
-        <el-form-item label="是否组合产品" prop="displayProductList">
+        <el-form-item label="是否组合物料" prop="displayProductList">
           <el-switch v-model="displayProductList" active-color="#13ce66" inactive-color="#ff4949" active-text="是"
             inactive-text="否">
           </el-switch>
         </el-form-item>
       </el-row>
       <el-row v-if="displayProductList">
-        <div class="title"><span style="color: red">*</span> 组合小产品</div>
+        <div class="title"><span style="color: red">*</span> 组合小物料</div>
         <el-table :data="productDetails" border style="width: 100%;">
           <el-table-column label="序号" type="index" width="50" align="center">
           </el-table-column>
-          <el-table-column prop="productName" header-align="center" align="center" label="产品名称">
+          <el-table-column prop="productName" header-align="center" align="center" label="物料名称">
           </el-table-column>
           <el-table-column prop="productSpec" header-align="center" align="center" label="规格">
           </el-table-column>
@@ -252,13 +252,13 @@ export default {
       this.visible = true
       this.id = id || 0
       this.display = display
-      // 获取产品类别
+      // 获取物料类别
       await getDictList({ type: 'product_type' }).then(({ data }) => {
         if (data) {
           this.optionsType = data
         }
       })
-      // 产品工艺
+      // 物料工艺
       if (!id) return
       await getProductDetail(this.id).then(({ data }) => {
         if (data && data.code === '200') {
@@ -284,7 +284,7 @@ export default {
             dealStepData(data.data.workFlowBusinessExt.workFlowProcessStepList, this.stepList)
             dealStepLogs(data.data.workFlowBusinessExt.processLogList, this.logList)
           }
-          // 组合小产品
+          // 组合小物料
           if (data.data.productMaterialList) {
             data.data.productMaterialList.forEach((item) => {
               this.productDetails.push({
@@ -295,7 +295,7 @@ export default {
             this.displayProductList = true
           }
 
-          // 产品图纸
+          // 物料图纸
           this.drawingList = data.data.proDrawings
         }
       })
@@ -306,7 +306,7 @@ export default {
     uploadSuccess2 (fileList2) {
       this.listingList = fileList2
     },
-    // 添加组合产品
+    // 添加组合物料
     addProduct () {
       this.productListVisible = true
       this.$nextTick(() => {
@@ -321,8 +321,7 @@ export default {
     },
     addProductItem (item) {
       this.productDetails.push({
-        productId: item.productId,
-        materialId: item.productId,
+        proProductId: item.productId,
         productName: item.productName,
         productSpec: item.productSpec,
         cnt: 1,
@@ -354,7 +353,7 @@ export default {
     dataFormSubmit () {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          // 组合小产品
+          // 组合小物料
           this.dataForm.composeProductMaterialList = []
           const b1 = this.displayProductList
           this.dataForm.isCompose = b1 === true ? '1' : '0'

src/views/modules/tech/product-change.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="my-title">产品变更</div>
+        <div class="my-title">物料变更</div>
         <!-- 表单 -->
       <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
         <el-row class="my-row">
@@ -9,7 +9,7 @@
           </el-form-item>
         </el-row>
         <el-row class="my-row">
-          <el-form-item label="产品变更通知单" prop="attachList">
+          <el-form-item label="物料变更通知单" prop="attachList">
             <upload-component :accept="'*'" v-model="dataForm.attachList"/>
           </el-form-item>
         </el-row>

src/views/modules/tech/product-detail.vue

@@ -54,7 +54,7 @@
           </div>
         </e-desc-item>
 
-        <e-desc-item v-if="fileList" label="产品图纸" span="3">
+        <e-desc-item v-if="fileList" label="物料图纸" span="3">
           <div v-for="(item, index) in fileList" style="display: inline">
             <span v-if="index > 0">,</span>
             <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
@@ -68,14 +68,14 @@
           </div>
         </e-desc-item>
 
-        <e-desc-item v-if="dataForm.attachList" label="产品技术文件" span="3">
+        <e-desc-item v-if="dataForm.attachList" label="物料技术文件" span="3">
           <div v-for="(item, index) in dataForm.attachList" style="display: inline">
             <span v-if="index > 0">,</span>
             <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
           </div>
         </e-desc-item>
 
-        <e-desc-item v-if="dataForm.listingList" label="产品配料清单" span="3">
+        <e-desc-item v-if="dataForm.listingList" label="物料配料清单" span="3">
           <div v-for="(item, index) in dataForm.listingList" style="display: inline">
             <span v-if="index > 0">,</span>
             <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
@@ -135,7 +135,7 @@
           </el-table-column>
         </el-table>
       </e-desc>
-      <e-desc title="组合小产品">
+      <e-desc title="组合小物料">
         <el-table
           :data="productDetails"
           border
@@ -150,7 +150,7 @@
             prop="productName"
             header-align="center"
             align="center"
-            label="产品名称">
+            label="物料名称">
           </el-table-column>
           <el-table-column
             prop="materialName"
@@ -178,7 +178,7 @@
           </el-table-column>
         </el-table>
       </e-desc>
-<!--      <e-desc title="产品配料清单">-->
+<!--      <e-desc title="物料配料清单">-->
 <!--        <el-table-->
 <!--          :data="materialList"-->
 <!--          border-->
@@ -286,17 +286,17 @@ export default {
               dealStepData(data.data.workFlowBusinessExt.workFlowProcessStepList, this.stepList)
               dealStepLogs(data.data.workFlowBusinessExt.processLogList, this.logList)
             }
-            // 组合小产品
+            // 组合小物料
             data.data.composeProductMaterialList.forEach((item) => {
               this.productDetails.push(item)
             })
-            // 产品配料清单
+            // 物料配料清单
             if (data.data.productMaterialList) {
               data.data.productMaterialList.forEach((item) => {
                 this.materialList.push(item)
               })
             }
-            // 产品图纸
+            // 物料图纸
             if (data.data.proDrawings) {
               // this.dataForm.drawingIdList = []
               data.data.proDrawings.forEach((item) => {

src/views/modules/tech/product-management.vue

@@ -1,4 +1,4 @@
-<!-- 产品管理 -->
+<!-- BOM清单 -->
 <template>
   <div class="product-management">
     <template v-if="!addOrUpdateVisible && !changeFormVisible && !attachVisible && !detailVisible && !craftsVisible && !drawVisible && !changeVisible && !noticeChangeVisible">
@@ -153,7 +153,7 @@
         <el-table-column
           header-align="center"
           align="center"
-          label="产品配料清单">
+          label="物料配料清单">
           <template slot-scope="scope">
             <el-button :disabled="!scope.row.listingList || scope.row.listingList.length === 0" type="text" size="small" @click="attachDetails2(scope.row)">查看</el-button>
           </template>
@@ -288,7 +288,7 @@ export default {
         this.noticeChangeVisible = false
         this.changeFormVisible = false
       },
-      // 获取产品类别字典
+      // 获取物料类别字典
       getTypeList () {
         getDictList({type: 'product_type'}).then(({data}) => {
           if (data) {
@@ -380,7 +380,7 @@ export default {
           this.$refs.changeForm.init(id)
         })
       },
-      // 转换属性“产品类别”
+      // 转换属性“物料类别”
       typeFormat (row) {
         if (this.optionsType) {
           for (let i = 0; i < this.optionsType.length; i++) {
@@ -390,7 +390,7 @@ export default {
           }
         }
       },
-      // 转换属性“是否组合产品”
+      // 转换属性“是否组合物料”
       composeFormat (row) {
         if (!row.isCompose) return ''
         if (Number(row.isCompose) === 1) {
@@ -425,21 +425,21 @@ export default {
           this.$refs.craftsDetail.init(id)
         })
       },
-      // 产品更改通知单
+      // 物料更改通知单
       changeDetails (row) {
         this.changeVisible = true
         this.$nextTick(() => {
           this.$refs.changeDetail.init(row.noticeChangeRecord.attachList)
         })
       },
-      // 产品技术文件
+      // 物料技术文件
       attachDetails (row) {
         this.attachVisible = true
         this.$nextTick(() => {
           this.$refs.attachDetail.init(row.attachList)
         })
       },
-      // 产品配料清单附件
+      // 物料配料清单附件
       attachDetails2 (row) {
         this.attachVisible = true
         this.$nextTick(() => {

src/views/modules/trace/order-detail.vue

@@ -40,7 +40,7 @@
         <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
       </e-desc>
 
-      <e-desc title="任务单产品明细">
+      <e-desc title="任务单物料明细">
         <el-table
           :data="productDetails"
           border
@@ -57,7 +57,7 @@
             align="center"
             min-width="140"
             :show-tooltip-when-overflow="true"
-            label="产品名称">
+            label="物料名称">
           </el-table-column>
           <el-table-column
             prop="prodCode"
@@ -65,7 +65,7 @@
             align="center"
             min-width="120"
             :show-tooltip-when-overflow="true"
-            label="产品编号">
+            label="物料编号">
           </el-table-column>
           <el-table-column
             prop="state"
@@ -196,7 +196,7 @@
                 })
               })
             }
-            // 任务单产品明细
+            // 任务单物料明细
             if (data.data.prodProductionList) {
               this.productDetails = data.data.prodProductionList
             }
@@ -218,13 +218,13 @@
         this.onChose()
         this.$emit('approveFinished')
       },
-      // 格式化产品状态
+      // 格式化物料状态
       formatState (row) {
         if (!row.state) return ''
         const item1 = this.optionsState.find((item) => item.code === row.state.toString())
         return item1 ? item1.value : ''
       },
-      // 查看产品记录
+      // 查看物料记录
       prodDetailHandle (productdId, prodCode) {
         this.prodVisible = true
         this.$nextTick(() => {

src/views/modules/trace/product-detail.vue

@@ -16,7 +16,7 @@
       >
         <el-row class="my-row">
           <el-col :span="8">
-            <el-form-item label="产品编号：">
+            <el-form-item label="物料编号：">
               <el-input v-model="dataForm.prodCode" disabled></el-input>
             </el-form-item>
           </el-col>

src/views/modules/trace/product-list.vue

@@ -1,7 +1,7 @@
-<!-- 产品追溯列表 -->
+<!-- 物料追溯列表 -->
 <template>
   <div class="product-list">
-    <div class="my-title" v-if="!detailsVisible">产品追溯</div>
+    <div class="my-title" v-if="!detailsVisible">物料追溯</div>
     <template v-if="!detailsVisible">
       <el-table
         :data="dataList"
@@ -20,7 +20,7 @@
           align="center"
           min-width="140"
           :show-tooltip-when-overflow="true"
-          label="产品名称">
+          label="物料名称">
         </el-table-column>
         <el-table-column
           prop="prodCode"
@@ -28,7 +28,7 @@
           align="center"
           min-width="100"
           :show-tooltip-when-overflow="true"
-          label="产品编号">
+          label="物料编号">
         </el-table-column>
         <el-table-column
           prop="orderCode"
@@ -194,7 +194,7 @@
           this.$refs.details.init(id, prodCode, disable)
         })
       },
-      // 创建新产品
+      // 创建新物料
       createNewProduct () {
         this.$message.warning('功能暂未开放')
       },

src/views/modules/trace/search.vue

@@ -7,7 +7,7 @@
           <el-input :placeholder="codePlaceHoler" v-model.trim="code" class="input-with-select">
             <el-select v-model="type" slot="prepend" placeholder="请选择">
               <el-option label="任务单" value="1"></el-option>
-              <el-option label="产品" value="2"></el-option>
+              <el-option label="物料" value="2"></el-option>
             </el-select>
             <el-button slot="append" type="primary" ref="searchBtn" :loading="searchloading" @click="search()">追溯</el-button>
           </el-input>
@@ -53,7 +53,7 @@ export default {
     },
     search () {
       if (this.code === '') {
-        this.$message.error('请输入任务单/产品编码')
+        this.$message.error('请输入任务单/物料编码')
         return
       }
       this.searchloading = true
@@ -76,7 +76,7 @@ export default {
         }).then(() => {
           this.searchloading = false
         })
-      } else if (this.type === '2') { // 产品追溯
+      } else if (this.type === '2') { // 物料追溯
         let params = {
           'prodCode': this.code
         }
@@ -107,7 +107,7 @@ export default {
     codePlaceHoler () {
       return this.type === '1'
         ? '请输入任务单编码'
-        : '请输入产品编号'
+        : '请输入物料编号'
     }
   }
 }

src/views/modules/warehouse/template-delivery-add.vue

@@ -14,8 +14,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="8" style="padding-left: 20px">
-          <el-form-item label="产品编号" prop="recordNumber">
-            <el-input v-model="dataForm.recordNumber" :disabled="true" placeholder="产品编号"></el-input>
+          <el-form-item label="物料编号" prop="recordNumber">
+            <el-input v-model="dataForm.recordNumber" :disabled="true" placeholder="物料编号"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8" style="padding-left: 20px">

src/views/modules/warehouse/template-delivery-detail.vue

@@ -30,7 +30,7 @@
       </div>
       <e-desc title="基本信息" column="3">
         <e-desc-item label="模板出库编码">{{dataForm.recordCode}}</e-desc-item>
-        <e-desc-item label="产品编号">{{dataForm.recordNumber}}</e-desc-item>
+        <e-desc-item label="物料编号">{{dataForm.recordNumber}}</e-desc-item>
         <e-desc-item label="模板名称">{{dataForm.templateName}}</e-desc-item>
 
         <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>

src/views/modules/warehouse/template-list.vue

@@ -74,7 +74,7 @@
           header-align="center"
           align="center"
           :formatter="formatProduct"
-          label="是否产品模板">
+          label="是否物料模板">
         </el-table-column>
         <el-table-column
           prop="creatorName"
@@ -199,7 +199,7 @@
           this.$refs.addOrUpdate.init(id, disable)
         })
       },
-      // 是否产品模板
+      // 是否物料模板
       formatProduct (row) {
         return row.productId ? '关联' : '非关联'
       },

src/views/modules/warehouse/template-outbound.vue

@@ -9,8 +9,8 @@
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
       <el-row class="my-row">
         <el-col :span="12">
-          <el-form-item label="产品编号：（手动录入）" prop="recordNumber">
-            <el-input v-model="dataForm.recordNumber"  placeholder="请输入产品编号"></el-input>
+          <el-form-item label="物料编号：（手动录入）" prop="recordNumber">
+            <el-input v-model="dataForm.recordNumber"  placeholder="请输入物料编号"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -43,7 +43,7 @@
         visible: false,
         dataForm: { },
         dataRule: {
-          recordNumber: [{ required: true, message: '产品编号不能为空', trigger: 'blur' }],
+          recordNumber: [{ required: true, message: '物料编号不能为空', trigger: 'blur' }],
           templateId: [{ required: true, message: '模板不能为空', trigger: 'change' }]
         }
       }

src/views/modules/works/handover-records.vue

@@ -3,11 +3,8 @@
     <div>
       <template v-if="!detailVisible">
         <el-form :inline="true" :model="dataForm" @keyup.enter.native="queryPage()">
-          <el-form-item label="名称">
-            <el-input v-model="dataForm.name" placeholder="名称" clearable/>
-          </el-form-item>
-          <el-form-item label="产品编号">
-            <el-input v-model="dataForm.code" placeholder="产品编号" clearable/>
+          <el-form-item label="工单名称">
+            <el-input v-model="dataForm.name" placeholder="工单名称" clearable/>
           </el-form-item>
           <el-form-item>
             <el-button @click="queryPage()">查询</el-button>
@@ -41,7 +38,7 @@
             label="转单类型">
             <template slot-scope="scope">
               <span>{{
-                transferTypeOption.findIndex((t) => t.value == scope.row.transferType) > -1 
+                transferTypeOption.findIndex((t) => t.value == scope.row.transferType) > -1
                 ? transferTypeOption.find((t) => t.value == scope.row.transferType).label
                 : ''
               }}</span>

src/views/modules/works/work-center.vue

@@ -20,7 +20,6 @@
                 :label="item.label"
                 :value="item.value"
               >
-              </el-option>
             </el-option>
           </el-select>
         </el-form-item>
@@ -111,8 +110,7 @@
             prop="attachList"
             header-align="center"
             align="center"
-            min-width="120"
-            :show-tooltip-when-overflow="true"
+            width="80"
             label="工单附件"
         >
             <template slot-scope="scope">

src/views/modules/works/work.vue

@@ -96,14 +96,14 @@
       >
       </el-table-column>
      <el-table-column
-        prop="attachListVo"
+        prop="attachList"
         header-align="center"
         align="center"
-        min-width="200"
+        width="80"
         label="工单附件"
       >
          <template slot-scope="scope">
-            <el-button :disabled="!scope.row.attachListVo || scope.row.attachListVo.length === 0" type="text" size="small" @click="changeDetails(scope.row.attachListVo)">查看</el-button>
+            <el-button :disabled="!scope.row.attachList || scope.row.attachList.length === 0" type="text" size="small" @click="changeDetails(scope.row.attachList)">查看</el-button>
          </template>
       </el-table-column>
       <el-table-column