Merge branch 'demo_' of http://123.60.19.203:8088/hitch/hitch-antd

src/views/sb/storecheckjob/modules/Detail.vue

@@ -10,10 +10,10 @@
     <detail-list title="" :col="2">
       <detail-list-item term="计划名称">{{ model.planName }}</detail-list-item>
       <detail-list-item term="盘点位置">{{ model.storeName }}</detail-list-item>
-      <detail-list-item term="设备名称">{{ model.spareName }}</detail-list-item>
-      <detail-list-item term="待盘数量">{{ model.checkNum}}</detail-list-item>
-      <detail-list-item term="实际数量">{{ model.realNum}}</detail-list-item>
-      <detail-list-item term="差异数量">{{ model.profitNum}}</detail-list-item>
+      <detail-list-item term="备件名称">{{ model.spareName }}</detail-list-item>
+      <detail-list-item term="待盘数量">{{ model.checkNum }}</detail-list-item>
+      <detail-list-item term="实际数量">{{ model.realNum }}</detail-list-item>
+      <detail-list-item term="差异数量">{{ model.profitNum }}</detail-list-item>
       <detail-list-item term="执行日期">{{ model.startTime }}</detail-list-item>
       <detail-list-item term="截至日期">{{ model.endTime }}</detail-list-item>
       <detail-list-item term="任务状态"><badge :status="DictCache.COLOR.STORE_CHECK_JOB_STATUS[model.status]" :text="statusMap[model.status]" /></detail-list-item>

src/views/workplace/backlog/NewWorkplaceBacklog.vue

@@ -117,7 +117,8 @@
               <span>领用</span>
             </div>
             <div class="btn" style="background:linear-gradient(to right,#941FFF,#BC72FB);" @click="$refs.sparebackform.base()">
-              <my-icon type="icon-tuiku" style="font-size:58px;"/>
+              <!-- <my-icon type="icon-tuiku" style="font-size:58px; color:#fff;"/> -->
+              <img src="@/assets/tuiku.png" width="60px" alt="">
               <span>退库</span>
             </div>
           </div>

src/views/workplace/backlog/SbInfoWorkplaceBacklog.vue

@@ -98,7 +98,7 @@
         <a-col class="gutter-row" :span="4">
           <div style="height: 471px;display:flex;flex-direction:column;justify-content: space-between">
             <div class="btn" style="background:linear-gradient(to right,#36B5FA,#26ECF5);">
-              <my-icon type="icon-wuliaotiaobo" style="font-size:58px;"/>
+              <img src="@/assets/diaobo.png" width="60px" alt="">
               <span>调拨</span>
             </div>
             <div class="btn" style="background:linear-gradient(to right,#FF416D,#FF847F);">
@@ -106,11 +106,11 @@
               <span>报废</span>
             </div>
             <div class="btn" style="background:linear-gradient(to right,#FB47D1,#F96EFE);">
-              <my-icon type="icon-tingjiyuanyinweihu" style="font-size:58px;"/>
+              <img src="@/assets/tingji.png" width="60px" alt="">
               <span>停机</span>
             </div>
             <div class="btn" style="background:linear-gradient(to right,#941FFF,#BC72FB);">
-              <my-icon type="icon-PC" style="font-size:58px;"/>
+              <img src="@/assets/pandian.png" width="60px" alt="">
               <span>盘点</span>
             </div>
           </div>