Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

src/BIZComponents/cBom-list.vue

@@ -103,7 +103,7 @@
 
 <script>
   import { getCBomAPI } from '@/api/main';
-  import {getInventoryTotalAPI} from "@/api/wms";
+  import { getInventoryTotalAPI } from '@/api/wms';
 
   export default {
     props: {
@@ -132,7 +132,7 @@
         where: {
           name: '',
           code: '',
-          specification:''
+          specification: ''
         }
       };
     },
@@ -183,13 +183,13 @@
             showOverflowTooltip: true
           },
           {
-            prop: 'specification',
+            prop: 'category.specification',
             label: '规格',
             align: 'center',
             showOverflowTooltip: true
           },
           {
-            prop: 'modelType',
+            prop: 'category.modelType',
             label: '型号',
             align: 'center',
             showOverflowTooltip: true
@@ -201,7 +201,7 @@
             showOverflowTooltip: true
           },
           {
-            prop: 'unit',
+            prop: 'category.measuringUnit',
             label: '单位',
             align: 'center',
             showOverflowTooltip: true
@@ -210,7 +210,10 @@
             prop: 'versions',
             label: '版本',
             align: 'center',
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            formatter: (_row, _column, cellValue) => {
+              return  cellValue?'V'+cellValue+'.0':'';
+            }
           }
         ];
       }
@@ -224,7 +227,7 @@
         this.loading = true;
         this.datasource = await getCBomAPI({
           categoryId: this.currentRow?.id,
-          bomType: 1,
+          bomType: 1
           // produceType: 2
         });
         this.oldDatasource = this.datasource;

src/views/saleManage/saleOrder/components/addDialog.vue

@@ -90,7 +90,7 @@
             />
           </el-form-item>
           <el-form-item label="合同编号" prop="contractNumber">
-            <el-input disabled v-model="form.contractNumber" />
+            <el-input :disabled="!!form.contractId" v-model="form.contractNumber" />
           </el-form-item>
 
           <el-form-item label="结算方式" prop="settlementMode">

src/views/saleManage/saleOrder/invoice/components/print-template-by.vue

@@ -94,11 +94,11 @@
       >
         <tbody>
           <tr align="center">
-            <td style="padding: 1px; width: 120px"> 产品编码 </td>
+            <!-- <td style="padding: 1px; width: 120px"> 产品编码 </td> -->
             <td style="padding: 1px"> 产品名称 </td>
             <td style="padding: 1px; width: 130px"> 规格 </td>
             <!-- <td style="padding: 1px"> 型号 </td> -->
-            <td style="padding: 1px"> 单位 </td>
+            <td style="padding: 1px"> 立方/块 </td>
             <td style="padding: 1px"> 数量 </td>
             <td style="padding: 1px"> 块数 </td>
             <td style="padding: 1px"> 强度 </td>
@@ -108,11 +108,11 @@
             <td style="padding: 1px"> 备注 </td>
           </tr>
           <tr align="center" v-for="(item, index) in codeList">
-            <td style="padding: 1px">{{ item.productCode }}</td>
+            <!-- <td style="padding: 1px">{{ item.productCode }}</td> -->
             <td style="padding: 1px">{{ item.productName }}</td>
             <td style="padding: 1px">{{ item.specification }}</td>
             <!-- <td style="padding: 1px">{{ item.modelType }}</td> -->
-            <td style="padding: 1px">{{ item.measuringUnit }}</td>
+            <td style="padding: 1px">{{ item.volume }}</td>
             <td style="padding: 1px">{{ item.totalCount }}</td>
             <td style="padding: 1px">{{ item.blockCount }}</td>
             <td style="padding: 1px">{{ item.extField.packagingStrength }}</td>
@@ -126,12 +126,12 @@
             <td style="padding: 1px">{{ item.remark }}</td>
           </tr>
           <tr align="center">
-            <td colspan="4" style="padding: 1px"> 合计 </td>
+            <td colspan="3" style="padding: 1px"> 合计 </td>
             <td colspan="1" style="padding: 1px">
               {{ getTotalValue('totalCount', 4) }}
             </td>
             <td style="padding: 1px"> {{ getTotalValue('blockCount',1) }}</td>
-            <td colspan="2" style="padding: 1px"></td>
+            <td colspan="3" style="padding: 1px"></td>
             <td colspan="1" style="padding: 1px" v-if="isPrintPrice">
               {{
                 codeList.reduce((total, item) => {
@@ -286,7 +286,8 @@
         let val = this.codeList.reduce((total, item) => {
           return (total += item[key]);
         }, 0);
-        return val.toFixed(4).replace(/\.?0+$/, '');
+   
+        return val&&parseFloat(val).toFixed(num).replace(/\.?0+$/, '')||0;
       },
       //获取当前日期函数
       getNowFormatDate() {