Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

.env.production

@@ -1,5 +1,5 @@
 NODE_ENV=production
 #VUE_APP_API_BASE_URL=http://220.191.168.86:18001/jeecg-boot
-VUE_APP_API_BASE_URL=http://220.191.168.86:18003/jeecg-boot
-VUE_APP_CAS_BASE_URL=http://220.191.168.86:18005/cas
+VUE_APP_API_BASE_URL=http://www.myfitt.cn:18003/jeecg-boot
+VUE_APP_CAS_BASE_URL=http://www.myfitt.cn:18005/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

src/views/reportForms/fabric-loss-table.vue

@@ -242,8 +242,8 @@
               <span v-else>{{text}}</span>
           </span>
           <!-- 无税金额-->
-        <span slot="iNoTaxMoney" slot-scope="text,record">
-              <a-input placeholder="请输入" v-model="record.iNoTaxMoney" v-if="showSelect==0 && record.cbusType!=='合计'" @blur="judageNumber(record,'iNoTaxMoney')"/>
+        <span slot="inoTaxMoney" slot-scope="text,record">
+              <a-input placeholder="请输入" v-model="record.inoTaxMoney" v-if="showSelect==0 && record.cbusType!=='合计'" @blur="judageNumber(record,'inoTaxMoney')"/>
               <span v-else>{{text}}</span>
           </span>
         </a-table>
@@ -597,7 +597,7 @@ export default {
         { title: '采购类型', width: 120, dataIndex: 'cbusType', className: 'replacecolor' , scopedSlots: { customRender: 'cbusType' }},
         { title: '工厂', width: 120, dataIndex: 'cvenAbbName', className: 'replacecolor', scopedSlots: { customRender: 'cvenAbbName' } },
         { title: '成本金额', dataIndex: 'imoney', width: 120, className: 'replacecolor',scopedSlots: { customRender: 'imoney' } },
-        { title: '无税金额', dataIndex: 'iNoTaxMoney', width: 120, className: 'replacecolor',scopedSlots: { customRender: 'iNoTaxMoney' } }
+        { title: '无税金额', dataIndex: 'inoTaxMoney', width: 120, className: 'replacecolor',scopedSlots: { customRender: 'inoTaxMoney' } }
       ],
       costInvoiceData: [
         { costInvoiceType: '纱款', factory: '17TW-C-17B', costAmount: '5081.72' },
@@ -686,7 +686,7 @@ export default {
           scopedSlots: { customRender: 'ingredientsInvoiceQuantity' }
         },
         { title: '开票金额(人民币)', width: '10%', dataIndex: 'isum', className: 'replacecolor' },
-        { title: '无税金额', width: '6%', dataIndex: 'iNoTaxMoney', className: 'replacecolor' },
+        { title: '无税金额', width: '6%', dataIndex: 'inoTaxMoney', className: 'replacecolor' },
         { title: '单位', width: '10%', dataIndex: 'ccomUnitName', className: 'replacecolor' },
         { title: '订单数', width: '10%', dataIndex: 'iquantity', className: 'replacecolor' },
         { title: '采购入库数', width: '10%', dataIndex: 'iquantityIn', className: 'replacecolor' }
@@ -711,7 +711,7 @@ export default {
             else
               return record.ioriSum;
          } },
-        { title: '无税金额', width: '6%', dataIndex: 'iNoTaxMoney', className: 'replacecolor' },
+        { title: '无税金额', width: '6%', dataIndex: 'inoTaxMoney', className: 'replacecolor' },
         { title: '单位', width: '10%', dataIndex: 'ccomUnitName', className: 'replacecolor' },
         { title: '订单数', width: '10%', dataIndex: 'iquantity', className: 'replacecolor' },
         { title: '采购入库数', width: '10%', dataIndex: 'iquantityIn', className: 'replacecolor' }
@@ -871,10 +871,10 @@ export default {
       }
        //计算成本发票合计
          var imoney = 0,
-         iNoTaxMoney = 0
+         inoTaxMoney = 0
          for (let row of this.fabricLoss.fabricCostInvoiceList){
             imoney += row.imoney*1;
-            iNoTaxMoney +=(row.iNoTaxMoney?row.iNoTaxMoney:0)*1
+            inoTaxMoney +=(row.inoTaxMoney?row.inoTaxMoney:0)*1
           }
           if(this.fabricLoss.fabricCostInvoiceList.length !==0){
             this.fabricLoss.fabricCostInvoiceList.push({
@@ -882,7 +882,7 @@ export default {
                 cbusType:'合计',
                 cvenAbbName:'',
                 imoney:parseFloat(imoney.toFixed(2)),
-                iNoTaxMoney:parseFloat(iNoTaxMoney.toFixed(2)),
+                inoTaxMoney:parseFloat(inoTaxMoney.toFixed(2)),
               })
           }
         //计算开票成本-面料合计
@@ -918,13 +918,13 @@ export default {
               })
           }
           //开票成本-辅料合计
-          var isum = 0,ioriSum=0,iquantity=0,iquantityIn=0,iquantityInvoice=0,iNoTaxMoney = 0
+          var isum = 0,ioriSum=0,iquantity=0,iquantityIn=0,iquantityInvoice=0,inoTaxMoney = 0
           for (let row of this.fabricLoss.fabricCostAssistList){
             isum += row.isum*1;
              iquantity += row.iquantity*1;
              iquantityIn += row.iquantityIn*1;
              iquantityInvoice += row.iquantityInvoice*1;
-             iNoTaxMoney += (row.iNoTaxMoney?row.iNoTaxMoney:0)*1
+             inoTaxMoney += (row.inoTaxMoney?row.inoTaxMoney:0)*1
              if(row.isum!==row.ioriSum){
                 ioriSum += row.ioriSum*1;
              }
@@ -937,7 +937,7 @@ export default {
                iquantity:parseFloat(iquantity.toFixed(4)),
               iquantityIn:parseFloat(iquantityIn.toFixed(4)),
                 iquantityInvoice:parseFloat(iquantityInvoice.toFixed(4)),
-                iNoTaxMoney:parseFloat(iNoTaxMoney.toFixed(4)),
+                inoTaxMoney:parseFloat(inoTaxMoney.toFixed(4)),
             })
           }
 
@@ -981,9 +981,9 @@ export default {
            this.$message.error('必须输入数字，请重新输入！');
            record.imoney = ''
         }
-        if(isNaN(Number(record.iNoTaxMoney)) && data=='iNoTaxMoney'){
+        if(isNaN(Number(record.inoTaxMoney)) && data=='inoTaxMoney'){
           this.$message.error('必须输入数字，请重新输入！');
-           record.iNoTaxMoney = ''
+           record.inoTaxMoney = ''
         }
         this.calculateTotal('notFrist')
     },