Merge remote-tracking branch 'origin/dev' into dev

src/components/price-Library/configuration/mainList.json

@@ -72,7 +72,7 @@
     },
     {
       "label": "供应商",
-      "prop": "corpId",
+      "prop": "corpCode",
       "index": 7,
       "width": 100,
       "overHidden": true

src/components/price-Library/main.vue

@@ -44,9 +44,6 @@
                   :configuration="goodsConfiguration"
                 />
               </template>
-              <template slot="corpId" slot-scope="{ row }">
-                <span>{{ row.corpName }}</span>
-              </template>
             </avue-crud>
           </el-col>
         </el-row>

src/enums/tax-rate.js

@@ -14,5 +14,5 @@ export const taxRates = [{
 }]
 // 订单状态过滤器
 export const taxRateFormat = (num) => {
-  return Number(num?num:0)+'%'
+  return num!=null?Number(num)+'%':'-'
 }

src/views/maintenance/priceLibrary/config/mainList.json

@@ -58,7 +58,7 @@
     },
     {
       "label": "供应商",
-      "prop": "corpId",
+      "prop": "corpCode",
       "search": true,
       "searchSpan": 8,
       "index": 6,

src/views/maintenance/priceLibrary/index.vue

@@ -51,8 +51,8 @@
             :false-label="0"
           />
         </template>
-        <template slot="corpIdSearch">
-          <crop-select v-model="search.corpId" corpType="GYS"></crop-select>
+        <template slot="corpCodeSearch">
+          <crop-select v-model="search.corpCode" corpType="GYS"></crop-select>
         </template>
         <template slot="dateValiditySearch">
           <el-date-picker
@@ -66,9 +66,6 @@
           >
           </el-date-picker>
         </template>
-        <template slot-scope="{ row }" slot="corpId">
-          {{ row.corpName }}
-        </template>
         <template slot-scope="{ row }" slot="grossProfitRate">
           {{ row.grossProfitRate ? scope.row.grossProfitRate : 0 }}%
         </template>