Преглед изворни кода

Merge branch 'deploy' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy

lilei пре 3 година
родитељ
комит
92669f5935

+ 2 - 2
src/views/financialManagement/financialCollection/list.vue

@@ -69,7 +69,7 @@
       </a-alert>
       <div v-if="$hasPermissions('B_financialCollectionPl')" style="margin-bottom: 15px">
         <a-button type="primary" id="financialCollectionList-export" :loading="loading" @click="handleCollection">批量收款</a-button>
-        <span style="margin-left: 8px">
+        <span style="margin-left: 8px" v-if="$hasPermissions('B_financialCollectionPl')">
           <template v-if="hasSelected">
             {{ `已选 ${selectedRowKeys.length} 项` }}
           </template>
@@ -80,7 +80,7 @@
         class="sTable"
         ref="table"
         size="default"
-        :row-selection="rowSelection"
+        :row-selection="$hasPermissions('B_financialCollectionPl') ? rowSelection : null"
         :rowKey="record => record.id"
         :columns="columns"
         :data="loadData"

+ 2 - 2
src/views/financialManagement/financialPayment/list.vue

@@ -68,7 +68,7 @@
       </a-alert>
       <div v-if="$hasPermissions('B_financialPaymentPl')" style="margin-bottom: 15px">
         <a-button type="primary" id="finacialPay-export" :loading="loading" @click="handlePayment">批量付款</a-button>
-        <span style="margin-left: 8px">
+        <span style="margin-left: 8px" v-if="$hasPermissions('B_financialPaymentPl')">
           <template v-if="hasSelected">
             {{ `已选 ${selectedRowKeys.length} 项` }}
           </template>
@@ -79,7 +79,7 @@
         class="sTable"
         ref="table"
         size="default"
-        :row-selection="rowSelection"
+        :row-selection="$hasPermissions('B_financialPaymentPl') ? rowSelection : null"
         :rowKey="record => record.id"
         :columns="columns"
         :data="loadData"

+ 1 - 1
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -93,7 +93,7 @@
         class="sTable"
         ref="table"
         size="default"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :row-selection="$hasPermissions('B_inventoryWarningBatchSave') ? { selectedRowKeys: selectedRowKeys, onChange: onSelectChange } : null"
         :rowKey="(record) => record.id"
         :columns="columns"
         :dataSource="loadData"

+ 3 - 0
src/views/productManagement/productInfo/edit.vue

@@ -218,6 +218,9 @@ export default {
           const productTypeSn2 = res.data.productTypeSn2 ? res.data.productTypeSn2 : ''
           const productTypeSn3 = res.data.productTypeSn3 ? res.data.productTypeSn3 : ''
           this.form.productType = [productTypeSn1, productTypeSn2, productTypeSn3]
+          if (res.data.productBrandName) {
+            this.fetchUser(res.data.productBrandName)
+          }
         } else {
           this.$refs.ruleForm.resetFields()
         }

+ 33 - 5
src/views/reportData/chainReceivedSendStorageReport/list.vue

@@ -231,7 +231,21 @@ export default {
       loadData: async parameter => {
         if (this.queryParam.beginDate) {
           this.disabled = true
-          return linkageReportPageList(Object.assign(parameter, this.queryParam)).then(res => {
+		  const params = {
+			  beginDate: this.queryParam.beginDate,
+			  endDate: this.queryParam.endDate,
+			  targetName: this.queryParam.targetName,
+			  productEntity: {
+				 code: this.queryParam.code, //  产品编码
+				 name: this.queryParam.name, //  产品名称
+				 origCode: this.queryParam.origCode, //  原厂编码
+				 productBrandSn: this.queryParam.productBrandSn, //  产品品牌
+				 productTypeSn1: this.queryParam.productTypeSn1, //  产品一级分类
+				 productTypeSn2: this.queryParam.productTypeSn2, //  产品二级分类
+				 productTypeSn3: this.queryParam.productTypeSn3 //  产品三级分类
+			  }
+		  }
+          return linkageReportPageList(Object.assign(parameter, params)).then(res => {
 			  const data = res.data
 			  const no = (data.pageNo - 1) * data.pageSize
 			  for (var i = 0; i < data.list.length; i++) {
@@ -281,8 +295,22 @@ export default {
     },
     // 查询总计
     getTotal () {
-      linkageReportPageTotal(this.queryParam).then(res => {
-        if (res.status == 200) {
+      const params = {
+		  beginDate: this.queryParam.beginDate,
+		  endDate: this.queryParam.endDate,
+		  targetName: this.queryParam.targetName,
+		  productEntity: {
+			 code: this.queryParam.code, //  产品编码
+			 name: this.queryParam.name, //  产品名称
+			 origCode: this.queryParam.origCode, //  原厂编码
+			 productBrandSn: this.queryParam.productBrandSn, //  产品品牌
+			 productTypeSn1: this.queryParam.productTypeSn1, //  产品一级分类
+			 productTypeSn2: this.queryParam.productTypeSn2, //  产品二级分类
+			 productTypeSn3: this.queryParam.productTypeSn3 //  产品三级分类
+		  }
+      }
+      linkageReportPageTotal(params).then(res => {
+        if (res.status == 200 && res.data) {
           console.log(res, 'rrrrrrrrr')
           this.totalData = res.data
         } else {
@@ -311,7 +339,7 @@ export default {
     },
     //  产品品牌  列表
     getProductBrand () {
-      dealerProductBrandQuery({ 'sysFlag': '0' }).then(res => {
+      dealerProductBrandQuery({}).then(res => {
 		  console.log(res, 'rrrrrr')
         if (res.status == 200) {
           this.productBrandList = res.data
@@ -323,7 +351,7 @@ export default {
     },
     //  产品分类  列表
     getProductType () {
-      dealerProductTypeList({ 'sysFlag': '0' }).then(res => {
+      dealerProductTypeList({}).then(res => {
         if (res.status == 200) {
           this.productTypeList = res.data
         } else {

+ 38 - 7
src/views/reportData/receivedSendStorageReport/list.vue

@@ -13,7 +13,7 @@
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-item label="日期">
-              <rangeDate ref="rangeDate" />
+              <rangeDate ref="rangeDate" @change="dateChange"/>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -220,7 +220,20 @@ export default {
       loadData: parameter => {
         if (this.queryParam.beginDate) {
           this.disabled = true
-          return reportPageList(Object.assign(parameter, this.queryParam)).then(res => {
+		  const params = {
+			  beginDate: this.queryParam.beginDate,
+			  endDate: this.queryParam.endDate,
+			  productEntity: {
+				 code: this.queryParam.code, //  产品编码
+				 name: this.queryParam.name, //  产品名称
+				 origCode: this.queryParam.origCode, //  原厂编码
+				 productBrandSn: this.queryParam.productBrandSn, //  产品品牌
+				 productTypeSn1: this.queryParam.productTypeSn1, //  产品一级分类
+				 productTypeSn2: this.queryParam.productTypeSn2, //  产品二级分类
+				 productTypeSn3: this.queryParam.productTypeSn3 //  产品三级分类
+			  }
+		  }
+          return reportPageList(Object.assign(parameter, params)).then(res => {
         	  const data = res.data
         	  const no = (data.pageNo - 1) * data.pageSize
         	  for (var i = 0; i < data.list.length; i++) {
@@ -242,6 +255,11 @@ export default {
     }
   },
   methods: {
+	  //  时间  change
+	  dateChange (date) {
+	    this.queryParam.beginDate = date[0]
+	    this.queryParam.endDate = date[1]
+	  },
     //  查询
     handleSearch () {
       this.$refs.ruleForm.validate(valid => {
@@ -259,9 +277,22 @@ export default {
     },
     // 查询总计
     getTotal () {
-	  linkageReportTotal(this.queryParam).then(res => {
-	    if (res.status == 200) {
-	      console.log(res, 'rrrrrrrrr')
+      const params = {
+		  beginDate: this.queryParam.beginDate,
+		  endDate: this.queryParam.endDate,
+		  productEntity: {
+			 code: this.queryParam.code, //  产品编码
+			 name: this.queryParam.name, //  产品名称
+			 origCode: this.queryParam.origCode, //  原厂编码
+			 productBrandSn: this.queryParam.productBrandSn, //  产品品牌
+			 productTypeSn1: this.queryParam.productTypeSn1, //  产品一级分类
+			 productTypeSn2: this.queryParam.productTypeSn2, //  产品二级分类
+			 productTypeSn3: this.queryParam.productTypeSn3 //  产品三级分类
+		  }
+      }
+	  linkageReportTotal(params).then(res => {
+	    if (res.status == 200 && res.data) {
+	      // console.log(res, 'rrrrrrrrr')
 	      this.totalData = res.data
 	    } else {
 	      this.totalData = {}
@@ -289,7 +320,7 @@ export default {
     },
     //  产品品牌  列表
     getProductBrand () {
-      dealerProductBrandQuery({ 'sysFlag': '0' }).then(res => {
+      dealerProductBrandQuery({}).then(res => {
         if (res.status == 200) {
           this.productBrandList = res.data
         } else {
@@ -299,7 +330,7 @@ export default {
     },
     //  产品分类  列表
     getProductType () {
-      dealerProductTypeList({ 'sysFlag': '0' }).then(res => {
+      dealerProductTypeList({}).then(res => {
         if (res.status == 200) {
           this.productTypeList = res.data
         } else {