Merge branch 'master' of https://github.com/shawncai/ERP

src/lang/zh.js

@@ -3119,6 +3119,10 @@ export default {
     qsrmm: '请输入密码'
   },
   updates: {
+    oldTaxRate: '原税率',
+    newTaxRate: '新税率',
+    oldIncludeTaxPrice: '原含税价',
+    newIncludeTaxPrice: '新含税价',
     stockrequrenumber: '采购需求编号',
     sfgouxuanqubqx: '是否勾选全部权限',
     jldwzbh: '计量单位组编号',

src/views/OutSourceEnter/AddOutSourceEnter.vue

@@ -128,6 +128,7 @@
             <el-editable-column :label="$t('updates.ys')" prop="color" align="center" width="150px"/>
             <el-editable-column :label="$t('Hmodule.gg')" prop="typeIdname" align="center" width="150px"/>
             <el-editable-column :label="$t('Hmodule.dw')" prop="unit" align="center" width="150px"/>
+            <el-editable-column :label="$t('updates.ybjsl')" prop="reportCheckingQuantity" align="center" width="150px"/>
             <!--            <el-editable-column prop="basicQuantity" align="center" :label="$t('updates.jbel')" width="150px"/>-->
             <el-editable-column :edit-render="{name: 'ElInputNumber', type: 'visible', attrs: {min: 0.00, precision: 2, controls:false}}" :label="$t('updates.rksl')" prop="actualEnterQuantity" align="center" width="150px"/>
             <el-editable-column :edit-render="{name: 'ElInput', type: 'visible'}" :label="$t('Hmodule.dj')" prop="enterPrice" align="center" width="150px"/>
@@ -337,7 +338,7 @@ export default {
       this.$refs.editable.clear()
       let flag = 0
       for (let i = 0; i < val.length; i++) {
-        if (val[i].qualifyQuantity > 0) {
+        if (val[i].qualifyQuantity > 0 && val[i].actualEnterQuantity > 0) {
           flag++
           this.$refs.editable.insert(val[i])
         }

src/views/OutSourceEnter/components/MyOther.vue

@@ -278,8 +278,20 @@ export default {
     outSourceDetail(val) {
       console.log(val)
       this.$refs.editable.clear()
+      let flag = 0
       for (let i = 0; i < val.length; i++) {
-        this.$refs.editable.insert(val[i])
+        if (val[i].qualifyQuantity > 0 && val[i].actualEnterQuantity > 0) {
+          flag++
+          this.$refs.editable.insert(val[i])
+        }
+      }
+      if (flag === 0) {
+        this.$notify.error({
+          title: 'wrong',
+          message: '请先质检再入库',
+          offset: 100
+        })
+        return false
       }
     },
     outSource(val) {

src/views/OutSourceEnter/components/OutSource.vue

@@ -315,7 +315,8 @@ export default {
       const OrderNumber = this.choosedata.number
       const outSourceDetail = outsourcingDetailVos.map(function(item) {
         return {
-          actualEnterQuantity: item.quantity,
+          reportCheckingQuantity: item.reportCheckingQuantity,
+          actualEnterQuantity: item.quantity - item.enterQuantity,
           qualifyQuantity: item.qualifyQuantity,
           productCode: item.productCode,
           productName: item.productName,

src/views/Product/ProductList.vue

@@ -31,6 +31,9 @@
           <el-option :label="$t('otherlanguage.jgj')" value="3"/>
           <el-option :label="$t('otherlanguage.xhp')" value="4"/>
           <el-option :label="$t('otherlanguage.dc')" value="5"/>
+          <el-option :label="$t('otherlanguage.xss')" value="6"/>
+          <el-option :label="$t('otherlanguage.pjj')" value="7"/>
+          <el-option :label="$t('otherlanguage.hj')" value="8"/>
         </el-select>
         <div class="seachbutton" style="width: 100%;float: right;margin-top: 20px">
           <el-button v-waves class="filter-item" type="primary" size="small" style="float: right" round @click="handleFilter">{{ $t('public.search') }}</el-button>

src/views/SaleOut/AddSaleOut.vue

@@ -296,7 +296,7 @@
                   :controls="false"
                   :min="1.00"
                   v-model="scope.row.quantity"
-                  @change="queryStock(scope.row)"
+                  @change="queryStock(scope.row, scope)"
                 />
                 <!-- <el-input v-if="isEdit2(scope.row)" v-model="personalForm.carCode" clearable/> -->
                 <span v-else>{{ scope.row.quantity }}</span>
@@ -1236,7 +1236,26 @@ export default {
         this.ableSubmission = true
       }
     },
-    queryStock(row) {
+    queryStock(row, scope) {
+      if (row !== '' && row !== null && row !== undefined && scope.$index === 0) {
+        if (row.quantity !== '' && row.quantity !== null && row.quantity !== undefined) {
+          for (let i = 0; i < this.list2.length; i++) {
+            this.list2[i].temp = i
+          }
+          for (let i = row.temp; i < this.list2.length; i++) {
+            console.log(this.list2[i].quantity)
+            if (this.list2[i].quantity === 1 || this.list2[i].quantity === null || this.list2[i].quantity === '' || this.list2[i].quantity === undefined) {
+              console.log(222)
+              // this.list2[i].requireDate = row.requireDate
+              const re = this.list2[i].productCode.slice(0, 2)
+              if (re !== '01' && re !== '05') {
+                this.list2[i].quantity = row.quantity
+              }
+            }
+          }
+          console.log(row)
+        }
+      }
       if (row.location === null || row.location === '' || row.location === undefined) {
         this.$notify.error({
           title: 'wrong',

src/views/SaleOut/NewAccessoriesOut.vue

@@ -180,7 +180,7 @@
                   :controls="false"
                   :min="1.00"
                   v-model="scope.row.quantity"
-                  @change="queryStock(scope.row)"
+                  @change="queryStock(scope.row, scope)"
                 />
                 <!-- <el-input v-if="isEdit2(scope.row)" v-model="personalForm.carCode" clearable/> -->
                 <span v-else>{{ scope.row.quantity }}</span>
@@ -1170,7 +1170,26 @@ export default {
         this.ableSubmission = true
       }
     },
-    queryStock(row) {
+    queryStock(row, scope) {
+      if (row !== '' && row !== null && row !== undefined && scope.$index === 0) {
+        if (row.quantity !== '' && row.quantity !== null && row.quantity !== undefined) {
+          for (let i = 0; i < this.list2.length; i++) {
+            this.list2[i].temp = i
+          }
+          for (let i = row.temp; i < this.list2.length; i++) {
+            console.log(this.list2[i].quantity)
+            if (this.list2[i].quantity === 1 || this.list2[i].quantity === null || this.list2[i].quantity === '' || this.list2[i].quantity === undefined) {
+              console.log(222)
+              // this.list2[i].requireDate = row.requireDate
+              const re = this.list2[i].productCode.slice(0, 2)
+              if (re !== '01' && re !== '05') {
+                this.list2[i].quantity = row.quantity
+              }
+            }
+          }
+          console.log(row)
+        }
+      }
       if (row.location === null || row.location === '' || row.location === undefined) {
         this.$notify.error({
           title: 'wrong',

src/views/Supplier/NewSupplier.vue

@@ -248,8 +248,32 @@
             <el-editable-column :label="$t('Hmodule.dw')" prop="unit" align="center" min-width="150px"/>
             <el-editable-column :label="$t('updates.ys')" prop="color" align="center" min-width="150px"/>
             <el-editable-column prop="proportion" align="center" label="供货比列(%)" min-width="150px"/>
-            <el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0,precision: 2,controls:false}, type: 'visible'}" prop="price" align="center" label="价格" min-width="150px"/>
+            <!-- <el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0,precision: 2,controls:false}, type: 'visible'}" prop="price" align="center" label="价格" min-width="150px" @change="getprice(scope.row)"/> -->
+            <el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0,max: 100,precision: 2,controls:false}, type: 'visible'}" :label="$t('Hmodule.dj')" prop="price" align="center" min-width="170px">
+              <template slot="edit" slot-scope="scope">
+                <el-input-number
+                  :precision="2"
+                  v-model="scope.row.price"
+                  @input="getprice(scope.row)"/>
+              </template>
+            </el-editable-column>
             <el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0,max: 100,precision: 2,controls:false}, type: 'visible'}" :label="$t('updates.zk')" prop="discountRate" align="center" min-width="150px"/>
+            <el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px">
+              <template slot="edit" slot-scope="scope">
+                <el-input-number
+                  :precision="2"
+                  v-model="scope.row.includeTaxPrice"
+                  @input="getincludeTaxPrice(scope.row)"/>
+              </template>
+            </el-editable-column>
+            <el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 2}, type: 'visible'}" :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px">
+              <template slot="edit" slot-scope="scope">
+                <el-input-number
+                  :precision="2"
+                  v-model="scope.row.taxRate"
+                  @input="gettaxRate(scope.row)"/>
+              </template>
+            </el-editable-column>
           </el-editable>
         </div>
       </el-card>
@@ -549,6 +573,23 @@ export default {
     _that = this
   },
   methods: {
+    // 计算单价
+    getprice(row) {
+      row.includeTaxPrice = (row.price * (1 + row.taxRate / 100)).toFixed(2)
+    },
+    // 通过税率计算含税价
+    gettaxRate(row) {
+      if (row.includeTaxPrice !== 0) {
+        row.includeTaxPrice = (row.price * (1 + row.taxRate / 100)).toFixed(2)
+      }
+    },
+    // 通过含税价计算税率
+    getincludeTaxPrice(row) {
+      if (row.price !== 0) {
+        row.taxRate = ((row.includeTaxPrice / row.price - 1) * 100).toFixed(2)
+        console.log(row.taxRate)
+      }
+    },
     jungleshow() {
       const roles = this.$store.getters.roles
       this.isshow = roles.includes('1-22-28-1')

src/views/Supplier/components/DetailList.vue

@@ -159,6 +159,8 @@
             <el-editable-column prop="proportion" align="center" label="供货比列(%)" min-width="150px"/>
             <el-editable-column prop="price" align="center" label="价格" min-width="150px"/>
             <el-editable-column :label="$t('updates.zk')" prop="discountRate" align="center" min-width="150px"/>
+            <el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="150px"/>
+            <el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" min-width="150px"/>
           </el-editable>
         </div>
       </el-card>

src/views/Supplier/components/MyDialog.vue

@@ -232,8 +232,31 @@
               <!--              <my-supplier :control.sync="proporcontrol" :procode="procode" @supplierName="personName2(scope, $event)"/>-->
             </template>
           </el-editable-column>
-          <el-editable-column prop="price" align="center" label="价格" min-width="150px"/>
+          <el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0,max: 100,precision: 2,controls:false}, type: 'visible'}" :label="$t('Hmodule.dj')" prop="price" align="center" min-width="170px">
+            <template slot="edit" slot-scope="scope">
+              <el-input-number
+                :precision="2"
+                v-model="scope.row.price"
+                @input="getprice(scope.row)"/>
+            </template>
+          </el-editable-column>
           <el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0,max: 100,precision: 2,controls:false}, type: 'visible'}" :label="$t('updates.zk')" prop="discountRate" align="center" min-width="150px"/>
+          <el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px">
+            <template slot="edit" slot-scope="scope">
+              <el-input-number
+                :precision="2"
+                v-model="scope.row.includeTaxPrice"
+                @input="getincludeTaxPrice(scope.row)"/>
+            </template>
+          </el-editable-column>
+          <el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 2}, type: 'visible'}" :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px">
+            <template slot="edit" slot-scope="scope">
+              <el-input-number
+                :precision="2"
+                v-model="scope.row.taxRate"
+                @input="gettaxRate(scope.row)"/>
+            </template>
+          </el-editable-column>
         </el-editable>
       </div>
     </el-card>
@@ -495,6 +518,23 @@ export default {
     _that = this
   },
   methods: {
+    // 计算单价
+    getprice(row) {
+      row.includeTaxPrice = (row.price * (1 + row.taxRate / 100)).toFixed(2)
+    },
+    // 通过税率计算含税价
+    gettaxRate(row) {
+      if (row.includeTaxPrice !== 0) {
+        row.includeTaxPrice = (row.price * (1 + row.taxRate / 100)).toFixed(2)
+      }
+    },
+    // 通过含税价计算税率
+    getincludeTaxPrice(row) {
+      if (row.price !== 0) {
+        row.taxRate = ((row.includeTaxPrice / row.price - 1) * 100).toFixed(2)
+        console.log(row.taxRate)
+      }
+    },
     handleConfirm() {
       console.log('this.list', this.list)
       let num = 0

src/views/SupplierAdjust/AddSupplierAdjust.vue

@@ -80,7 +80,33 @@
             <el-editable-column :label="$t('updates.ys')" prop="color" align="center" min-width="150px"/>
             <el-editable-column :label="$t('Hmodule.dw')" prop="unit" align="center" min-width="150px"/>
             <el-editable-column :label="$t('updates.cgdyj')" prop="oldPrice" align="center" min-width="150px"/>
-            <el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 2}, type: 'visible'}" :label="$t('updates.cgdxj')" prop="newPrice" align="center" min-width="150px"/>
+            <el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0,max: 100,precision: 2,controls:false}, type: 'visible'}" :label="$t('updates.cgdxj')" prop="newPrice" align="center" min-width="170px">
+              <template slot="edit" slot-scope="scope">
+                <el-input-number
+                  :precision="2"
+                  v-model="scope.row.newPrice"
+                  @input="getprice(scope.row)"/>
+              </template>
+            </el-editable-column>
+            <!-- <el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 2}, type: 'visible'}" :label="$t('updates.cgdxj')" prop="newPrice" align="center" min-width="150px"/> -->
+            <el-editable-column :label="$t('updates.oldIncludeTaxPrice')" prop="oldIncludeTaxPrice" align="center" min-width="150px"/>
+            <el-editable-column :label="$t('updates.newIncludeTaxPrice')" prop="newIncludeTaxPrice" align="center" min-width="170px">
+              <template slot="edit" slot-scope="scope">
+                <el-input-number
+                  :precision="2"
+                  v-model="scope.row.newIncludeTaxPrice"
+                  @input="getincludeTaxPrice(scope.row)"/>
+              </template>
+            </el-editable-column>
+            <el-editable-column :label="$t('updates.oldTaxRate')" prop="oldTaxRate" align="center" min-width="150px"/>
+            <el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 2}, type: 'visible'}" :label="$t('updates.newTaxRate')" prop="newTaxRate" align="center" min-width="170px">
+              <template slot="edit" slot-scope="scope">
+                <el-input-number
+                  :precision="2"
+                  v-model="scope.row.newTaxRate"
+                  @input="gettaxRate(scope.row)"/>
+              </template>
+            </el-editable-column>
           </el-editable>
         </div>
       </el-card>
@@ -299,6 +325,23 @@ export default {
     _that = this
   },
   methods: {
+    // 计算单价
+    getprice(row) {
+      row.newIncludeTaxPrice = (row.newPrice * (1 + row.newTaxRate / 100)).toFixed(2)
+    },
+    // 通过税率计算含税价
+    gettaxRate(row) {
+      if (row.newIncludeTaxPrice !== 0) {
+        row.newIncludeTaxPrice = (row.newPrice * (1 + row.newTaxRate / 100)).toFixed(2)
+      }
+    },
+    // 通过含税价计算税率
+    getincludeTaxPrice(row) {
+      if (row.newPrice !== 0) {
+        row.newTaxRate = ((row.newIncludeTaxPrice / row.newPrice - 1) * 100).toFixed(2)
+        console.log(row.newTaxRate)
+      }
+    },
     checkStock(row) {
       console.log('this.moreaction.length', this.moreaction.length)
       if (this.moreaction.length > 1 || this.moreaction.length === 0) {
@@ -420,6 +463,8 @@ export default {
         val.supplierDetailVos[i].typeId = val.supplierDetailVos[i].type
         val.supplierDetailVos[i].type = val.supplierDetailVos[i].productTypeName
         val.supplierDetailVos[i].oldPrice = val.supplierDetailVos[i].price
+        val.supplierDetailVos[i].oldIncludeTaxPrice = val.supplierDetailVos[i].includeTaxPrice
+        val.supplierDetailVos[i].oldTaxRate = val.supplierDetailVos[i].taxRate
         this.$refs.editable.insert(val.supplierDetailVos[i])
       }
       this.supplierId = val.supplierName

src/views/SupplierAdjust/components/DetailList.vue

@@ -63,6 +63,10 @@
             <el-editable-column :label="$t('Hmodule.dw')" prop="unit" align="center" />
             <el-editable-column :label="$t('updates.cgdyj')" prop="oldPrice" align="center" min-width="150px"/>
             <el-editable-column :label="$t('updates.cgdxj')" prop="newPrice" align="center" min-width="150px"/>
+            <el-editable-column :label="$t('updates.oldIncludeTaxPrice')" prop="oldIncludeTaxPrice" align="center" min-width="150px"/>
+            <el-editable-column :label="$t('updates.newIncludeTaxPrice')" prop="newIncludeTaxPrice" align="center" min-width="150px"/>
+            <el-editable-column :label="$t('updates.oldTaxRate')" prop="oldTaxRate" align="center" min-width="150px"/>
+            <el-editable-column :label="$t('updates.newTaxRate')" prop="newTaxRate" align="center" min-width="150px"/>
           </el-editable>
         </div>
       </el-card>