Bläddra i källkod

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

chenrui 2 år sedan
förälder
incheckning
17d0fbf7fa

+ 6 - 0
src/utils/request.js

@@ -35,6 +35,7 @@ const err = (error) => {
       message: '提示',
       description: '无网络连接,请检查网络是否连接正常'
     })
+    store.state.app.curActionPermission = ''
     store.commit('SET_loadingStatus', false)
     return Promise.reject(err)
   }
@@ -46,6 +47,7 @@ const err = (error) => {
     console.log(status,resData)
     if ((status == 503 || status == 500 || status == 404)) {
       notification.destroy()
+      store.state.app.curActionPermission = ''
       if(resData instanceof Blob){
         resData.text().then(data => {
           const res = JSON.parse(data)
@@ -132,6 +134,7 @@ service.interceptors.response.use((response) => {
       content: response.data.message,
       onOk () {
         sessionStorage.setItem('errorTips', 0)
+        store.state.app.curActionPermission = ''
         store.dispatch('Logout').then(() => {
           window.location.reload()
         })
@@ -139,6 +142,7 @@ service.interceptors.response.use((response) => {
     })
   }
   if ((response.data.status == '401' || response.data.status == '500') && window.location.pathname != '/user/login') {
+    store.state.app.curActionPermission = ''
     notification.destroy()
     notification.error({
       message: '提示',
@@ -146,6 +150,7 @@ service.interceptors.response.use((response) => {
     })
   }
   if (response.data.status == '900' && window.location.pathname != '/user/login') {
+    store.state.app.curActionPermission = ''
     notification.destroy()
     notification.error({
       message: response.data.message,
@@ -153,6 +158,7 @@ service.interceptors.response.use((response) => {
     })
   }
   if(response.data.status!='200'){
+    store.state.app.curActionPermission = ''
     store.commit('SET_loadingStatus', false)
   }
   return response.data

+ 1 - 1
src/views/allocationManagement/transferOut/edit.vue

@@ -248,7 +248,7 @@
                     <a-select-option v-if="loadDataSource&&loadDataSource[index]&&loadDataSource[index].specialPrice" :value="loadDataSource[index].specialPrice" :key="'C-'+loadDataSource[index].productSn" :label="loadDataSource[index].specialPrice">C价 {{ loadDataSource[index].specialPrice }}</a-select-option>
                   </a-select>
                 </div>
-                <span v-else>{{ record.price }}</span>
+                <span v-else>{{ toThousands(record.price) }}</span>
               </template>
               <!-- 调出数量 -->
               <template slot="qty" slot-scope="text, record">

+ 5 - 5
src/views/productManagement/priceChangeRecord/list.vue

@@ -70,27 +70,27 @@
         </template>
         <!-- 省级价变更后 -->
         <template slot="afterProvincePrice" slot-scope="text, record">
-          <span v-if="record.afterProvincePrice || record.afterProvincePrice==0" :class="record.beforeProvincePrice != record.afterProvincePrice ? 'red' : ''">{{ record.afterProvincePrice }}</span>
+          <span v-if="record.afterProvincePrice || record.afterProvincePrice==0" :class="record.beforeProvincePrice != record.afterProvincePrice ? 'red' : ''">{{ toThousands(record.afterProvincePrice) }}</span>
           <span v-else>--</span>
         </template>
         <!-- 市级价变更后 -->
         <template slot="afterCityPrice" slot-scope="text, record">
-          <span v-if="record.afterCityPrice || record.afterCityPrice==0" :class="record.beforeCityPrice != record.afterCityPrice ? 'red' : ''">{{ record.afterCityPrice }}</span>
+          <span v-if="record.afterCityPrice || record.afterCityPrice==0" :class="record.beforeCityPrice != record.afterCityPrice ? 'red' : ''">{{ toThousands(record.afterCityPrice) }}</span>
           <span v-else>--</span>
         </template>
         <!-- 特约价变更后 -->
         <template slot="afterSpecialPrice" slot-scope="text, record">
-          <span v-if="record.afterSpecialPrice || record.afterSpecialPrice==0" :class="record.beforeSpecialPrice != record.afterSpecialPrice ? 'red' : ''">{{ record.afterSpecialPrice }}</span>
+          <span v-if="record.afterSpecialPrice || record.afterSpecialPrice==0" :class="record.beforeSpecialPrice != record.afterSpecialPrice ? 'red' : ''">{{ toThousands(record.afterSpecialPrice) }}</span>
           <span v-else>--</span>
         </template>
         <!-- 终端价变更后 -->
         <template slot="afterTerminalPrice" slot-scope="text, record">
-          <span v-if="record.afterTerminalPrice || record.afterTerminalPrice==0" :class="record.beforeTerminalPrice != record.afterTerminalPrice ? 'red' : ''">{{ record.afterTerminalPrice }}</span>
+          <span v-if="record.afterTerminalPrice || record.afterTerminalPrice==0" :class="record.beforeTerminalPrice != record.afterTerminalPrice ? 'red' : ''">{{ toThousands(record.afterTerminalPrice) }}</span>
           <span v-else>--</span>
         </template>
         <!-- 车主价变更后 -->
         <template slot="afterCarOwnersPrice" slot-scope="text, record">
-          <span v-if="record.afterCarOwnersPrice || record.afterCarOwnersPrice==0" :class="record.beforeCarOwnersPrice != record.afterCarOwnersPrice ? 'red' : ''">{{ record.afterCarOwnersPrice }}</span>
+          <span v-if="record.afterCarOwnersPrice || record.afterCarOwnersPrice==0" :class="record.beforeCarOwnersPrice != record.afterCarOwnersPrice ? 'red' : ''">{{ toThousands(record.afterCarOwnersPrice) }}</span>
           <span v-else>--</span>
         </template>
       </s-table>

+ 6 - 1
src/views/salesManagement/salesQuery/detail.vue

@@ -176,7 +176,7 @@
       </a-button>
     </div>
     <!-- 打印导出 -->
-    <print-modal :openModal="openModal" :itemData="detailData" :nowType="nowType" @ok="handleOk" @close="openModal=false" />
+    <print-modal :openModal="openModal" :itemData="detailData" :nowType="nowType" @ok="handleOk" @close="closePrint" />
     <!-- 审核 -->
     <auditModal
       :openModal="visibleAudit"
@@ -435,6 +435,11 @@ export default {
         this.openModal = true
       }
     },
+    closePrint(){
+      console.log(9)
+      this.$store.state.app.curActionPermission = ''
+      this.openModal = false
+    },
     // 确定打印或预览,导出
     handleOk (objs) {
       const _this = this