66

src/views/saleOrder/index.vue

@@ -8,7 +8,7 @@
         :activeName="activeName"
       >
       </order-search>
-      <el-tabs v-model="activeName" type="card" >
+      <el-tabs v-model="activeName" type="card">
         <el-tab-pane label="待排产" name="first"></el-tab-pane>
         <el-tab-pane label="已排产" name="second"></el-tab-pane>
       </el-tabs>
@@ -62,7 +62,7 @@
         <template v-slot:action="{ row }">
           <template>
             <el-link
-              v-if="row.orderSource != 1 && row.activeName == 'first'"
+              v-if="row.orderSource != 1 && activeName == 'first'"
               type="primary"
               :underline="false"
               icon="el-icon-edit"
@@ -72,7 +72,7 @@
             </el-link>
 
             <el-popconfirm
-              v-if="row.orderSource != 1 && row.activeName == 'first'"
+              v-if="row.orderSource != 1 && activeName == 'first'"
               class="ele-action"
               title="确定要删除此销售订单吗？"
               @confirm="remove(row)"
@@ -107,7 +107,7 @@
   } from '@/api/saleOrder';
   import dictMixins from '@/mixins/dictMixins';
   import { debounce } from 'lodash';
-import { Alert } from 'element-ui';
+  import { Alert } from 'element-ui';
   export default {
     name: 'saleOrder',
     mixins: [dictMixins],
@@ -204,8 +204,7 @@ import { Alert } from 'element-ui';
             prop: 'model',
             label: '型号',
             align: 'center',
-            minWidth: 120,
-
+            minWidth: 120
           },
           {
             prop: 'priority',
@@ -372,7 +371,6 @@ import { Alert } from 'element-ui';
         });
       },
 
-
       /* 表格数据源 */
       async datasource({ page, limit, where, order }) {
         if (this.activeName == 'first') {

src/views/saleOrder/salesToProduction.vue

@@ -134,13 +134,13 @@
           <el-table-column label="行号" align="center" prop="lineNumber">
           </el-table-column>
           <el-table-column
-            :label="'合同数量' + (clientEnvironmentId == '4' ? '(方)' : '')"
+            :label="'订单数量' + (clientEnvironmentId == '4' ? '(方)' : '')"
             align="center"
             prop="contractNum"
           >
           </el-table-column>
           <el-table-column
-            label="合同重量"
+            label="订单重量"
             align="center"
             prop="productSumWeight"
           >
@@ -825,10 +825,10 @@ export default {
         }
       }
       row.planProductNum = Number(row.planProductNum.toFixed(5));
-      row.contractNum=row.planProductNum;
-      row.requiredFormingNum = row.planProductNum;
-      row.lackNum = row.planProductNum;
-      this.form.contractNum=row.planProductNum;
+      // row.contractNum=row.planProductNum;
+      // row.requiredFormingNum = row.planProductNum;
+      // row.lackNum = row.planProductNum;
+      // this.form.contractNum=row.planProductNum;
     },
     confirmChoose(list) {
       // 取出在弹窗中选中并且不在表格中的数据