瀏覽代碼

Merge branch 'develop_yh13' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh13

chenrui 2 年之前
父節點
當前提交
a12fc0cff1

+ 8 - 0
src/api/financeBook.js

@@ -19,6 +19,14 @@ export const queryLastFinish = (params) => {
     method: 'post'
   })
 }
+// 获取最新一次钉钉审核人员信息
+export const queryLastFinishDingUser = (params) => {
+  return axios({
+    url: `/financeBook/queryLastFinishDingUser`,
+    data: params,
+    method: 'post'
+  })
+}
 // 统计
 export const financeBookQueryCount = (params) => {
   return axios({

+ 12 - 3
src/views/expenseManagement/expenseReimbursement/chooseDepartUserModal.vue

@@ -57,6 +57,7 @@
 <script>
 import dingDepartUser from '@/views/common/dingDepartUser.js'
 import { getDefaultCofig } from '@/api/data.js'
+import { queryLastFinishDingUser } from '@/api/financeBook.js'
 export default {
   name: 'ChooseDepartUserModal',
   components: { dingDepartUser },
@@ -64,6 +65,10 @@ export default {
     openModal: { //  弹框显示状态
       type: Boolean,
       default: false
+    },
+    useDingDefUser: { // 是否使用最新一次申请人员
+      type: Boolean,
+      default: false
     }
   },
   data () {
@@ -130,9 +135,13 @@ export default {
       })
     },
     async getDefAudit(){
-      const data = getDefaultCofig({code:'EXPENSE_ACCOUNT_DING_USER'}).then(res => res.data)
-      console.log(data)
-      
+      if(!this.useDingDefUser){
+        const data = getDefaultCofig({code:'EXPENSE_ACCOUNT_DING_USER'}).then(res => res.data)
+        console.log(data)
+      }else{
+        const data = queryLastFinishDingUser().then(res => res.data)
+        console.log(data)
+      }
     },
     resetForm () {
       this.$nextTick(() => {

+ 1 - 4
src/views/financialManagement/financialCollection/baseModal.vue

@@ -241,12 +241,9 @@ export default {
   watch: {
     show (newValue, oldValue) {
       this.opened = newValue
-      if (!newValue) {
+      if (newValue) {
         this.pageInit()
       }
-    },
-    bookSn (a, b) {
-      console.log(a)
     }
   }
 }

+ 1 - 1
src/views/financialManagement/financialCollection/edit.vue

@@ -163,7 +163,7 @@
       :bookNo="detailData?detailData.bookNo:''"
       @cancel="openFcDetailModal=false"></fcDetailModal>
     <!-- 选择审核人员 -->
-    <chooseDepartUserModal :openModal="openDepartUserModal" @close="openDepartUserModal=false" @submit="handleSubmit"></chooseDepartUserModal>
+    <chooseDepartUserModal useDingDefUser :openModal="openDepartUserModal" @close="openDepartUserModal=false" @submit="handleSubmit"></chooseDepartUserModal>
     <!-- 关联单据 -->
     <selectGlSalesModal
       ref="selGlSalesModal"

+ 6 - 4
src/views/inventoryManagement/intelligentReplenishment/detailModal.vue

@@ -26,6 +26,7 @@
             :loading="loading"
             :scroll="{ y: 400 }"
             :pagination="false"
+            v-if="detailData&&detailData.stockPredictRange == 0"
             bordered>
           </a-table>
         </div>
@@ -92,6 +93,8 @@ export default {
           this.detailData = res.data
           if (this.detailData.stockPredictRange == 0) { //  自选产品
             this.getPredictRange()
+          }else{
+            this.loadData = []
           }
         } else {
           this.detailData = null
@@ -161,10 +164,9 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
-      }
-    },
-    itemSn (newValue, oldValue) {
-      if (this.isShow && newValue) {
+        this.detailData = null
+         this.loadData = []
+      }else{
         this.getDetail()
       }
     }

+ 2 - 4
src/views/salesManagement/matchSendOutOrder/list.vue

@@ -76,10 +76,8 @@
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="4" :sm="24">
-                  <a-form-model-item label="地区">
-                    <a-form-model-item prop="shippingAddrProvinceSn">
-                      <Area id="matchSoo-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
-                    </a-form-model-item>
+                  <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
+                    <Area id="matchSoo-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                   </a-form-model-item>
                 </a-col>
               </template>

+ 4 - 1
src/views/salesManagement/pushOrderManagement/exportExcelModal.vue

@@ -19,7 +19,7 @@
       >
         <a-form-model-item label="销售单号">{{ itemData&&itemData.salesBillNo || '--' }}</a-form-model-item>
         <a-form-model-item label="客户名称">{{ itemData&&itemData.buyerName || '--' }}</a-form-model-item>
-        <a-form-model-item label="产品售价" prop="priceType">
+        <a-form-model-item label="产品售价" prop="priceType" v-if="$hasPermissions('B_dispatchExport_salesPrice')">
           <a-radio-group v-model="form.priceType">
             <a-radio value="DISPATCH_BILL_PRICE">导出</a-radio>
             <a-radio value="DISPATCH_BILL">不导出</a-radio>
@@ -71,6 +71,9 @@ export default {
       _this.$store.state.app.curActionPermission = 'B_dispatchExport'
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
+          if(!this.$hasPermissions('B_dispatchExport_salesPrice')){
+            _this.form.priceType = 'DISPATCH_BILL'
+          }
           _this.$emit('ok', _this.form.priceType, {}, '下推产品')
           _this.isShow = false
         } else {

+ 20 - 4
src/views/salesManagement/salesQuery/printModal.vue

@@ -34,19 +34,23 @@
             <a-radio value="LESS">缺货</a-radio>
           </a-radio-group>
         </a-form-model-item>
-        <a-form-model-item label="产品售价" prop="priceType">
+        <a-form-model-item label="产品售价" prop="priceType"  v-if="nowType=='SALES_BILL_TYPE'&&$hasPermissions('B_salesTypePrint_salesPrice')">
           <!-- 销售分类打印 -->
-          <a-radio-group v-model="form.priceType" v-if="nowType=='SALES_BILL_TYPE'">
+          <a-radio-group v-model="form.priceType">
             <a-radio value="SALES_BILL_TYPE_COST">打印</a-radio>
             <a-radio value="SALES_BILL_TYPE">不打印</a-radio>
           </a-radio-group>
+        </a-form-model-item>
+        <a-form-model-item label="产品售价" prop="priceType" v-if="nowType=='SALES_BILL'&&$hasPermissions('B_salesPrint_salesPrice')">
           <!-- 销售打印 -->
-          <a-radio-group v-model="form.priceType" v-if="nowType=='SALES_BILL'">
+          <a-radio-group v-model="form.priceType">
             <a-radio value="SALES_BILL_COST">打印</a-radio>
             <a-radio value="SALES_BILL">不打印</a-radio>
           </a-radio-group>
+        </a-form-model-item>
+        <a-form-model-item label="产品售价" prop="priceType" v-if="nowType=='export'&&$hasPermissions('B_salesDetailExport_salesPrice')">
           <!-- 销售导出 -->
-          <a-radio-group v-model="form.priceType" v-if="nowType=='export'">
+          <a-radio-group v-model="form.priceType">
             <a-radio :value="form.dataScope == 'ENOUGH' ? 'SALES_BILL_COST_NOT_LACK':'SALES_BILL_COST'">导出</a-radio>
             <a-radio :value="form.dataScope == 'ENOUGH' ? 'SALES_BILL_NOT_LACK':'SALES_BILL'">不导出</a-radio>
           </a-radio-group>
@@ -128,6 +132,18 @@ export default {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
+          // 销售分类无权限不打印
+          if(!_this.$hasPermissions('B_salesTypePrint_salesPrice')){
+            _this.form.priceType = 'SALES_BILL_TYPE'
+          }
+          // 销售打印无权限不打印
+          if(!_this.$hasPermissions('B_salesPrint_salesPrice')){
+            _this.form.priceType = 'SALES_BILL'
+          }
+          // 销售导出无权限不导出
+          if(!_this.$hasPermissions('B_salesDetailExport_salesPrice')){
+            _this.form.priceType = _this.form.dataScope == 'ENOUGH' ? 'SALES_BILL_NOT_LACK':'SALES_BILL'
+          }
           // 分类打印
           if (_this.nowType == 'SALES_BILL_TYPE') {
             const item = _this.typeList.find(item => item.id == _this.form.id)