添加是否免税字段

applications/dee-mes/src/privateComponents/components/PurchasingWarehousingNewOrEdit/component/importFile.vue

@@ -128,7 +128,8 @@ export default {
         arrivalDate: this.param.arrivalDate || '',
         materialTypeId: this.param.materialTypeId || '',
         extDxProductAreaId: this.param.extDxProductAreaId || '',
-        extDxSipplierId: this.param.extDxSipplierId || ''
+        extDxSipplierId: this.param.extDxSipplierId || '',
+        hasTaxExemption: this.param.hasTaxExemption || ''
       }
       const arrReaParams = []
       for (const key in reqParams) {
@@ -140,6 +141,9 @@ export default {
         this.uploading = false
         this.$utils.showMessageSuccess(res.data.message)
         const reqObj = isNew ? res.data.items : null
+        if (reqObj !== null) {
+          reqObj.hasTaxExemption = this.param.hasTaxExemption
+        }
         this.$emit('refreshTable', reqObj)
         this.close()
       }).catch(err => {

applications/dee-mes/src/privateComponents/components/PurchasingWarehousingNewOrEdit/component/storageDetailsCreateCom.vue

@@ -395,6 +395,11 @@ export default {
       this.$set(this.form, 'arrivalDate', this.header.arrivalDate)
       const childrenAddOrEdit = this.header.materialTypeName.label === '外购成品' && (this.operateType === 'ADD' || (this.operateType === 'MODIFY' && !this.form.isRoot))
       const parentIsVirtual = this.form.isVirtual
+      let isTaxExemption = false
+      if (this.header.hasTaxExemption === '是') {
+        isTaxExemption = true
+        this.$set(this.form, 'taxRate', 0)
+      }
       switch (this.header.billType) {
         case '器材':
         case 'Material':
@@ -659,6 +664,7 @@ export default {
               title: '税率',
               key: 'taxRate',
               component: {
+                disabled: isTaxExemption,
                 clearable: true,
                 name: 'el-input-number',
                 min: 0,
@@ -1044,7 +1050,8 @@ export default {
               key: 'taxRate',
               component: {
                 clearable: true,
-                disabled: childrenAddOrEdit && !parentIsVirtual,
+                // disabled: childrenAddOrEdit && !parentIsVirtual,
+                disabled: isTaxExemption,
                 name: 'el-input-number',
                 min: 0,
                 placeholder: '请输入税率'
@@ -1393,7 +1400,8 @@ export default {
               key: 'taxRate',
               component: {
                 clearable: true,
-                disabled: childrenAddOrEdit && !parentIsVirtual,
+                // disabled: childrenAddOrEdit && !parentIsVirtual,
+                disabled: isTaxExemption,
                 name: 'el-input-number',
                 min: 0,
                 placeholder: '请输入税率'
@@ -2042,7 +2050,8 @@ export default {
             'remark': this.form.remark || '/',
             'operateType': this.operateType,
             'MaterialResCode': this.form.resCode,
-            'deliverySpec': this.basicData.deliverySpec || '/'
+            'deliverySpec': this.basicData.deliverySpec || '/',
+            'hasTaxExemption': this.header.hasTaxExemption || ''
           }
           newTableData.extMaterial.operator = 'NO_CHANGE'
           this.$emit('addTableData', newTableData)

applications/dee-mes/src/privateComponents/components/PurchasingWarehousingNewOrEdit/index.vue

@@ -64,7 +64,7 @@ export default {
     return {
       loading: false,
       currBasicData: null,
-      form: {},
+      form: { hasTaxExemption : '否' },
       formData: [{
         title: '基本信息',
         split: 2,
@@ -115,16 +115,16 @@ export default {
             }
           },
           {
-            title: "是否免税",
-            key: "hasTax",
+            title: '是否免税',
+            key: 'hasTaxExemption',
             component: {
               clearable: true,
-              name: "el-select",
+              name: 'el-select',
               options: [
-                { value: "Y", label: "是" },
-                { value: "N", label: "否" },
-              ],
-            },
+                { value: '是', label: '是' },
+                { value: '否', label: '否' }
+              ]
+            }
           },
           {
             title: '供应商',
@@ -222,7 +222,7 @@ export default {
             trigger: ['blur', 'change']
           }
         ],
-        hasTax: [
+        hasTaxExemption: [
           {
             required: true,
             message: '请填写表单信息',
@@ -510,6 +510,7 @@ export default {
         { title: '入库金额', key: 'stockPrice', headerAlign: 'center' },
         { title: '含税单价', key: 'taxUnitPrice', headerAlign: 'center' },
         { title: '含税金额', key: 'taxPrice', headerAlign: 'center' },
+        { title: '是否免税', key: 'hasTaxExemption', headerAlign: 'center' },
         { title: '税率', key: 'taxRate', headerAlign: 'center' },
         { title: '报检人', key: 'creator.userName', headerAlign: 'center' },
         {
@@ -572,26 +573,27 @@ export default {
           'arrivalDate': this.form.arrivalDate,
           'materialTypeId': this.form.materialTypeId,
           'extDxProductAreaId': this.form.extDxProductAreaId,
-          'extDxSipplierId': this.form.extDxSipplierId
+          'extDxSipplierId': this.form.extDxSipplierId,
+          'hasTaxExemption': this.form.hasTaxExemption
         }
       }
     },
     isSignApproval() {
       return this.$route && this.$route.name === 'TaskCenterHome'
     },
-    invisibleHasTax:function() {
-      let filterData = this.formData[0].data;
-      if (this.form.billType === "OutSource") {
-        filterData = this.formData[0].data.filter((item) => item.key !== "hasTax");
+    invisibleHasTaxExemption: function() {
+      let filterData = this.formData[0].data
+      if (this.form.billType === 'OutSource') {
+        filterData = this.formData[0].data.filter((item) => item.key !== 'hasTaxExemption')
       }
       return [
         {
-            title: "基本信息",
+          title: '基本信息',
           split: 2,
-            data: filterData || [],
-          },
-        ];
-      },
+          data: filterData || []
+        }
+      ]
+    }
   },
   watch: {
   },

applications/dee-mes/src/privateComponents/components/PurchasingWarehousingProcess_view/index.vue

@@ -261,6 +261,7 @@ export default {
         { title: '含税单价', key: 'taxUnitPrice', align: 'center', headerAlign: 'center' },
         { title: '含税金额', key: 'taxPrice', align: 'center', headerAlign: 'center' },
         { title: '税率', key: 'taxRate', align: 'center', headerAlign: 'center' },
+        { title: '是否免税', key: 'hasTaxExemption', headerAlign: 'center' },
         { title: '报检人', key: 'creator.userName', align: 'center', headerAlign: 'center' },
         {
           title: '接受仓库', key: 'extname', align: 'center', headerAlign: 'center', formatter: (row, column, cellValue, index) => {

applications/dee-mes/src/privateComponents/components/PurchasingWarehousingView/index.vue

@@ -128,6 +128,7 @@ export default {
         { title: '入库金额', key: 'stockPrice', align: 'center', headerAlign: 'center' },
         { title: '含税单价', key: 'taxUnitPrice', align: 'center', headerAlign: 'center' },
         { title: '含税金额', key: 'taxPrice', align: 'center', headerAlign: 'center' },
+        { title: '是否免税', key: 'hasTaxExemption', headerAlign: 'center' },
         { title: '税率', key: 'taxRate', align: 'center', headerAlign: 'center' },
         { title: '报检人', key: 'creator.userName', align: 'center', headerAlign: 'center' },
         {