lilei 2 tahun lalu
induk
melakukan
16a7e7dc28

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1677462954139
+  "version": 1677464697079
 }

+ 2 - 2
src/components/index.less

@@ -82,7 +82,7 @@
 }
  
 .ant-btn-primary.button-error {
-  background-color: #f30;
+  background-color: #ed1c24;
   border-color: #f30;
   margin: 0 5px;
   font-size: 12px;
@@ -200,7 +200,7 @@
 }
  
 .ant-btn-link.button-error {
-  color: #f30;
+  color: #ed1c24;
   &:hover, &:focus {
     color: #ff6666;
   }

+ 5 - 4
src/components/tools/UserMenu.vue

@@ -60,12 +60,12 @@
         </span>
       </a-popover>
 
-      <p class="help-cont" @click="showShopCar">
+      <p class="help-cont" @click="screen">
         <a-popover placement="bottom">
         <template slot="content">
-          <span>全屏</span>
+          <span>{{ isFullscreen?'全屏':'取消全屏' }}</span>
         </template>
-        <a-icon type="fullscreen" @click="screen" style="font-size:14px;margin: 0 5px;color: #666;"/>
+        <a-icon :type="isFullscreen?'fullscreen':'fullscreen-exit'" style="font-size:14px;margin: 0 5px;color: #666;"/>
       </a-popover>
       </p>
 
@@ -137,7 +137,7 @@ export default {
     printName () {
       const defName = this.printDefNeedle
       return defName && defName != 'undefined' ? defName : null
-    }
+    },
   },
   data () {
     return {
@@ -183,6 +183,7 @@ export default {
         return false
       }
       screenfull.toggle()
+      this.isFullscreen = screenfull.isFullscreen
     },
     // 切换角色
     changeRoles (sn) {

+ 5 - 5
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -15,7 +15,7 @@
         <div style="margin-top: 5px;">
           <PrintPanel v-if="$hasPermissions('B_purchasePrint')" :disabled="localDataSource.length==0" @handlePrint="handlePrint"></PrintPanel>
           <a-divider type="vertical" v-if="detail&&detail.totalCategory" />
-          <a-button type="link" v-if="detail&&detail.totalCategory" @click="showSearch=!showSearch" class="button-default"> <a-icon type="search" /> 筛选</a-button>
+          <a-button type="link" v-if="detail&&detail.totalCategory" @click="showSearch=!showSearch" :class="showSearch?'button-error':'button-default'"> <a-icon type="search" /> 筛选</a-button>
           <a-divider type="vertical" v-if="detail&&detail.totalCategory" />
           <a-button v-if="detail&&detail.totalCategory" id="purchaseNewOrderEdit-add-btn" type="link" @click="openChooseProduct=true"><a-icon type="plus" />添加产品</a-button>
           <a-divider type="vertical" />
@@ -279,8 +279,8 @@ export default {
         }}
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(3, 0, { title: '采购单价',key: "h", field: 'discountedPrice', width: '10%', align: 'right', operationColumn: false})
-        arr.splice(6, 0, { title: '采购金额',key: "i", field: 'discountedAmount', width: '10%', align: 'right', operationColumn: false})
+        arr.splice(3, 0, { title: '采购单价',key: "h", field: 'discountedPriceText', width: '10%', align: 'right', operationColumn: false})
+        arr.splice(6, 0, { title: '采购金额',key: "i", field: 'discountedAmountText', width: '10%', align: 'right', operationColumn: false})
       }
       return arr
     }
@@ -312,8 +312,8 @@ export default {
             row.productCode = row.dealerProductEntity.code || '--'
             row.productName = row.dealerProductEntity.name || '--'
             row.productUnit = row.dealerProductEntity.unit || '--'
-            row.discountedPrice = (row.discountedPrice||row.discountedPrice==0)?this.toThousands(row.discountedPrice, 2):'--'
-            row.discountedAmount = (row.discountedAmount||row.discountedAmount==0)?this.toThousands(row.discountedAmount, 2):'--'
+            row.discountedPriceText = (row.discountedPrice||row.discountedPrice==0)?this.toThousands(row.discountedPrice, 2):'--'
+            row.discountedAmountText = (row.discountedAmount||row.discountedAmount==0)?this.toThousands(row.discountedAmount, 2):'--'
           }
           this.localDataSource = data.list
           this.disabled = false