ysy 2 lat temu
rodzic
commit
14cf6fc375

+ 3 - 3
src/components/print/OrderPrint.vue

@@ -37,10 +37,10 @@
         <el-row
         <el-row
           class="processes-data"
           class="processes-data"
           :key="index"
           :key="index"
-          v-if="item.taskTypeName === '挤压成型'"
+          v-if="item.taskTypeName === '挤压生产'"
         >
         >
           <el-col :span="24" class="bg top">
           <el-col :span="24" class="bg top">
-            <div class="title">{{ index + 1 }}0 挤压成型</div>
+            <div class="title">{{ index + 1 }}0 挤压生产</div>
           </el-col>
           </el-col>
           <!-- <el-col :span="10" class="bg top">备注:</el-col> -->
           <!-- <el-col :span="10" class="bg top">备注:</el-col> -->
           <template v-for="(itm, idx) in item.list || []">
           <template v-for="(itm, idx) in item.list || []">
@@ -357,7 +357,7 @@
           6: '已完成',
           6: '已完成',
           7: '已延期'
           7: '已延期'
         },
         },
-        // 挤压成型
+        // 挤压生产
         extrusion: [
         extrusion: [
           {
           {
             label: '原料牌号',
             label: '原料牌号',

+ 2 - 2
src/views/produceOrder/components/createDialog.vue

@@ -40,11 +40,11 @@
             formData.requiredFormingNum
             formData.requiredFormingNum
           }}</el-descriptions-item>
           }}</el-descriptions-item>
           <el-descriptions-item
           <el-descriptions-item
-            label="成型数量"
+            label="生产数量"
             label-class-name="produce-create-bg"
             label-class-name="produce-create-bg"
             content-class-name="produce-create-bg"
             content-class-name="produce-create-bg"
           >
           >
-            <span slot="label" class="label-required">成型数量</span>
+            <span slot="label" class="label-required">生产数量</span>
             <el-form-item prop="formingNum" required>
             <el-form-item prop="formingNum" required>
               <el-input-number
               <el-input-number
                 v-model="formData.formingNum"
                 v-model="formData.formingNum"

+ 2 - 2
src/views/produceOrder/components/order-dailog.vue

@@ -109,13 +109,13 @@
           },
           },
           {
           {
             prop: 'formedNum',
             prop: 'formedNum',
-            label: '已成型数量',
+            label: '已生产数量',
             align: 'center',
             align: 'center',
             showOverflowTooltip: true
             showOverflowTooltip: true
           },
           },
           {
           {
             prop: 'formedWeight',
             prop: 'formedWeight',
-            label: '已成型重量',
+            label: '已生产重量',
             align: 'center',
             align: 'center',
             showOverflowTooltip: true
             showOverflowTooltip: true
           },
           },

+ 1 - 1
src/views/produceOrder/components/pickingDialog.vue

@@ -20,7 +20,7 @@
       return {
       return {
         visible: false,
         visible: false,
         list: [
         list: [
-          { label: '挤压成型', type: '1' },
+          { label: '挤压生产', type: '1' },
           { label: '自然干燥', type: '2' },
           { label: '自然干燥', type: '2' },
           { label: '升温干燥', type: '3' },
           { label: '升温干燥', type: '3' },
           { label: '半加定长', type: '4' },
           { label: '半加定长', type: '4' },

+ 2 - 2
src/views/produceOrder/components/unpackDialog.vue

@@ -43,7 +43,7 @@
                 trigger: 'change'
                 trigger: 'change'
               },
               },
               {
               {
-                pattern: /^\d+(\.{0,1}\d+){0,1}$/, message: '拆单数超过成型数量', trigger: ['blur', 'change']
+                pattern: /^\d+(\.{0,1}\d+){0,1}$/, message: '拆单数超过生产数量', trigger: ['blur', 'change']
               }
               }
             ]">
             ]">
               <el-input disabled v-model="formingNum" placeholder="请输入"></el-input>
               <el-input disabled v-model="formingNum" placeholder="请输入"></el-input>
@@ -304,7 +304,7 @@ export default {
             this.$nextTick(() => {
             this.$nextTick(() => {
               this.$set(this.form.unpackList[index], 'formingNum', 0)
               this.$set(this.form.unpackList[index], 'formingNum', 0)
             })
             })
-            this.$message.error('拆单数超过成型数量')
+            this.$message.error('拆单数超过生产数量')
 
 
             return
             return
           }
           }

+ 6 - 6
src/views/produceOrder/detail.vue

@@ -55,10 +55,10 @@
         <el-descriptions-item label="实际开始时间">{{
         <el-descriptions-item label="实际开始时间">{{
           infoData.startTime
           infoData.startTime
         }}</el-descriptions-item>
         }}</el-descriptions-item>
-        <el-descriptions-item label="已成型数量(PCS)">{{
+        <el-descriptions-item label="已生产数量(PCS)">{{
           infoData.formedNum
           infoData.formedNum
         }}</el-descriptions-item>
         }}</el-descriptions-item>
-        <el-descriptions-item label="已成型重量(KG)">{{
+        <el-descriptions-item label="已生产重量(KG)">{{
           infoData.formedWeight
           infoData.formedWeight
         }}</el-descriptions-item>
         }}</el-descriptions-item>
         <el-descriptions-item label="已交付数量(PCS)">{{
         <el-descriptions-item label="已交付数量(PCS)">{{
@@ -87,7 +87,7 @@
           v-for="(item, index) in tabList"
           v-for="(item, index) in tabList"
           :key="item.taskCode"
           :key="item.taskCode"
         ></el-tab-pane>
         ></el-tab-pane>
-        <!--        <el-tab-pane label="挤压成型" name="1"> </el-tab-pane>
+        <!--        <el-tab-pane label="挤压生产" name="1"> </el-tab-pane>
         <el-tab-pane label="自然干燥" name="2"></el-tab-pane>
         <el-tab-pane label="自然干燥" name="2"></el-tab-pane>
         <el-tab-pane label="升温干燥" name="3"></el-tab-pane>
         <el-tab-pane label="升温干燥" name="3"></el-tab-pane>
         <el-tab-pane label="半加定长" name="4"></el-tab-pane>
         <el-tab-pane label="半加定长" name="4"></el-tab-pane>
@@ -109,7 +109,7 @@
           <div class="tips-box">
           <div class="tips-box">
             <ul
             <ul
               v-if="
               v-if="
-                chooseItem == '挤压成型' ||
+                chooseItem == '挤压生产' ||
                 chooseItem.includes('模压') ||
                 chooseItem.includes('模压') ||
                 chooseItem.includes('挤压') ||
                 chooseItem.includes('挤压') ||
                 (chooseItem.includes('等静压') && activeName == 0)
                 (chooseItem.includes('等静压') && activeName == 0)
@@ -266,7 +266,7 @@
         activeName: '0',
         activeName: '0',
         tabList: [],
         tabList: [],
         columnOpt: {
         columnOpt: {
-          挤压成型: [
+          挤压生产: [
             {
             {
               label: '序号',
               label: '序号',
               type: 'index',
               type: 'index',
@@ -1080,7 +1080,7 @@
             name.includes('等静压')) &&
             name.includes('等静压')) &&
           this.activeName == 0
           this.activeName == 0
         ) {
         ) {
-          return this.columnOpt['挤压成型'];
+          return this.columnOpt['挤压生产'];
         }
         }
         return (
         return (
           this.columnOpt[this.tabList[this.activeName].taskTypeName] ||
           this.columnOpt[this.tabList[this.activeName].taskTypeName] ||

+ 2 - 2
src/views/produceOrder/index.vue

@@ -250,14 +250,14 @@ export default {
         },
         },
         {
         {
           prop: 'formedNum',
           prop: 'formedNum',
-          label: '已成型数量',
+          label: '已生产数量',
           align: 'center',
           align: 'center',
           showOverflowTooltip: true,
           showOverflowTooltip: true,
           minWidth: 110
           minWidth: 110
         },
         },
         {
         {
           prop: 'formedWeight',
           prop: 'formedWeight',
-          label: '已成型重量',
+          label: '已生产重量',
           align: 'center',
           align: 'center',
           showOverflowTooltip: true,
           showOverflowTooltip: true,
           minWidth: 110
           minWidth: 110

+ 2 - 2
src/views/produceOrder/picking.vue

@@ -160,13 +160,13 @@
             prop: 'formingWeight'
             prop: 'formingWeight'
           },
           },
           {
           {
-            label: '未成型数量',
+            label: '未生产数量',
             formatter: (row) => {
             formatter: (row) => {
               return row.formingNum - row.formedNum;
               return row.formingNum - row.formedNum;
             }
             }
           },
           },
           {
           {
-            label: '未成型重量',
+            label: '未生产重量',
             formatter: (row) => {
             formatter: (row) => {
               return row.formingWeight - row.formedWeight;
               return row.formingWeight - row.formedWeight;
             }
             }

+ 4 - 4
src/views/produceOrder/report.vue

@@ -59,10 +59,10 @@
           <el-descriptions-item label="实际开始时间">{{
           <el-descriptions-item label="实际开始时间">{{
             infoData.startTime
             infoData.startTime
           }}</el-descriptions-item>
           }}</el-descriptions-item>
-          <el-descriptions-item label="已成型数量(PCS)">{{
+          <el-descriptions-item label="已生产数量(PCS)">{{
             infoData.formedNum
             infoData.formedNum
           }}</el-descriptions-item>
           }}</el-descriptions-item>
-          <el-descriptions-item label="已成型重量(KG)">{{
+          <el-descriptions-item label="已生产重量(KG)">{{
             infoData.formedWeight
             infoData.formedWeight
           }}</el-descriptions-item>
           }}</el-descriptions-item>
           <el-descriptions-item label="已交付数量(PCS)">{{
           <el-descriptions-item label="已交付数量(PCS)">{{
@@ -106,7 +106,7 @@
           v-for="(item, index) in tabList"
           v-for="(item, index) in tabList"
           :key="item.id"
           :key="item.id"
         ></el-tab-pane>
         ></el-tab-pane>
-        <!--<el-tab-pane label="挤压成型" name="挤压成型"></el-tab-pane>
+        <!--<el-tab-pane label="挤压生产" name="挤压生产"></el-tab-pane>
         <el-tab-pane label="自然干燥" name="自然干燥"></el-tab-pane>
         <el-tab-pane label="自然干燥" name="自然干燥"></el-tab-pane>
         <el-tab-pane label="升温干燥" name="升温干燥"></el-tab-pane>
         <el-tab-pane label="升温干燥" name="升温干燥"></el-tab-pane>
         <el-tab-pane label="半加定长" name="半加定长"></el-tab-pane>
         <el-tab-pane label="半加定长" name="半加定长"></el-tab-pane>
@@ -182,7 +182,7 @@
           3: '预制订单'
           3: '预制订单'
         },
         },
         componentsList: {
         componentsList: {
-          挤压成型: 'Extrusion',
+          挤压生产: 'Extrusion',
           自然干燥: 'Drying',
           自然干燥: 'Drying',
           升温干燥: 'Heating',
           升温干燥: 'Heating',
           半加: 'HalfAdded',
           半加: 'HalfAdded',