Browse Source

bug修复

qymljy 9 months ago
parent
commit
1527792954

+ 1 - 1
src/HDrpManagement/accountsReceivableMag/index.vue

@@ -30,7 +30,7 @@
               <el-row :gutter="20">
                 <el-col :span="6" class="mt-10">
                   <div class="acccounet__panel" style="border:1px solid #d8dde8">
-                    <p class="normal-margin">{{$t('总应收')}}</p>
+                    <p class="normal-margin">{{$t('总逾期')}}</p>
                     <p class="normal-title" style="font-size:29px;color:#151515" >
                       <small>{{allList.sumallaoverduemount || allList.sumallaoverduemount == '0'?'¥':''}}</small>
                       {{allList.sumallaoverduemount || allList.sumallaoverduemount == 0?tool.formatAmount(allList.sumallaoverduemount,2):'--'}}

+ 1 - 1
src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -416,7 +416,7 @@ export default {
       this.totalPrice = this.tool.formatAmount(this.totalPrice, 2);
       this.list = res.data;
       this.total = res.total;
-      this.$refs.addProduct.doLayout();
+      // this.$refs.addProduct.doLayout();
       this.$emit("priceChange");
     },
     /*修改数量*/

+ 1 - 1
src/HDrpManagement/contractManage/modules/detail.vue

@@ -408,7 +408,7 @@ export default {
       this.queryMainData(this.$route.query.id)
     },
     async queryMainData(id) {
-      this.$refs.details.$refs.group.queryGroup()
+      // this.$refs.details.$refs.group.queryGroup()
       const res = await this.$api.requested({
         "id":20221121195102,
         "content": {

+ 4 - 5
src/HDrpManagement/dispatch/details/index.vue

@@ -16,10 +16,10 @@
       </div>
       <div slot="customOperation">
         <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.STATUS == '新建'" :data="mainData" @onSuccess="onSuccess" />
-        <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'createBill')" :disabled="mainData.STATUS !== '复核'" @click="addLogistics">{{$t(`生成物流单`)}}</el-button>
-        <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.STATUS !== '新建' && mainData.STATUS !== '审核'" @click="onCheck">{{mainData.STATUS === '审核'?$t('反审'):mainData.STATUS === '复核'?$t('反审'):$t('审核')}}</el-button>
-        <el-button  class="inline-16" type="primary" size="mini" v-if="tool.checkAuth($route.name,'recheck')" :disabled="mainData.STATUS !== '审核' && mainData.STATUS !== '复核'" @click="onReCheck">{{mainData.STATUS === '复核'?$t('反复核'):$t('复核')}}</el-button>
-        <el-button type="primary" size="mini" @click="onDel" style="margin-left: 0px" class="inline-16" :disabled="mainData.STATUS === '审核' || mainData.STATUS === '复核'">{{$t('删 除')}}</el-button>
+        <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'createBill')" :disabled="mainData.STATUS !== '复核'" @click="addLogistics">{{$t(`生成物流单`)}}</el-button>
+        <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.STATUS !== '新建' && mainData.STATUS !== '审核'" @click="onCheck" style="margin-left: 0">{{mainData.STATUS === '审核'?$t('反审'):mainData.STATUS === '复核'?$t('反审'):$t('审核')}}</el-button>
+        <el-button  class="inline-16" type="primary" size="mini" v-if="tool.checkAuth($route.name,'recheck')" :disabled="mainData.STATUS !== '审核' && mainData.STATUS !== '复核'" @click="onReCheck" style="margin-left: 0">{{mainData.STATUS === '复核'?$t('反复核'):$t('复核')}}</el-button>
+        <el-button type="primary" size="mini" @click="onDel" class="inline-16" :disabled="mainData.STATUS === '审核' || mainData.STATUS === '复核'" style="margin-left: 0">{{$t('删 除')}}</el-button>
       </div>
       <div slot="slot2" >
         <default-info :mainData="mainData"></default-info>
@@ -268,5 +268,4 @@ import defaultInfo from '../modules/defaultInfo.vue'
   </script>
 
   <style scoped>
-
   </style>

+ 1 - 1
src/HDrpManagement/projectData/index.vue

@@ -3159,7 +3159,7 @@ export default {
             position:'bottom'
           },
           // 添加 中心统计文本 交互
-          interactions: [{ type: 'element-highlight-by-x ' },{ type: 'element-active' }],
+          interactions: [{ type: 'element-highlight-by-x ' },{ type: 'element-selected' },{ type: 'element-active' }],
         });
         this.projectScoreMap.on('element:click',(v) => {
           if (v.data.data.key != this.scoreTableParam.content.where.istask) {

+ 1 - 1
src/HDrpManagement/salerpriceData/components/balanceDetail.vue

@@ -63,7 +63,7 @@
                   scope.column.data.county
                 }}
               </span>
-              <spna v-else>--</spna>
+              <span v-else>--</span>
             </p>
             <p v-else-if="scope.column.columnname === 'balance'">
               {{

+ 1 - 1
src/HManagement/serviceDataScreen/index.vue

@@ -22,7 +22,7 @@
         <div class="time-style">
           <div>
             <span class="span">{{ymd}}</span>
-            <spna class="span">{{week}}</spna>
+            <span class="span">{{week}}</span>
             <span>{{nowTime}}</span>
           </div>
           <div>

+ 1 - 1
src/SDrpManagement/accountsReceivable/index.vue

@@ -30,7 +30,7 @@
               <el-row :gutter="20">
                 <el-col :span="6" class="mt-10">
                   <div class="acccounet__panel" style="border:1px solid #d8dde8">
-                    <p class="normal-margin">{{$t('总应收')}}</p>
+                    <p class="normal-margin">{{$t('总逾期')}}</p>
                     <p class="normal-title" style="font-size:29px;color:#151515" >
                       <small>{{allList.sumallaoverduemount || allList.sumallaoverduemount == '0'?'¥':''}}</small>
                       {{allList.sumallaoverduemount || allList.sumallaoverduemount == 0?tool.formatAmount(allList.sumallaoverduemount,2):'--'}}

+ 1 - 1
src/views/salesData/components/balanceDetail.vue

@@ -22,7 +22,7 @@
               <span v-if="scope.column.data.province && scope.column.data.city && scope.column.data.county">
                 {{scope.column.data.province+'-'+scope.column.data.city+'-'+scope.column.data.county}}
               </span>
-              <spna v-else>--</spna>
+              <span v-else>--</span>
             </p>
             <p v-else-if="scope.column.columnname === 'balance'">
               {{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}