linwenxin 8 mesiacov pred
rodič
commit
4c4144b574

+ 0 - 2
src/api/dataCount.js

@@ -8,7 +8,6 @@ export function dataCountMaterialCount(params) {
   })
 }
 
-
 export function dataCountRepairProject(params) {
   return request({
     url: '/dataCount/repairProject',
@@ -17,7 +16,6 @@ export function dataCountRepairProject(params) {
   })
 }
 
-
 export function dataCountIncreCount(params) {
   return request({
     url: '/dataCount/increCount',

+ 145 - 114
src/views/auxiliaryFittings/home/index.vue

@@ -25,6 +25,30 @@
             </div>
           </div>
         </div>
+        <!-- ---------new-------- -->
+        <div class="mode">
+          <div class="title">师傅辅材列表统计</div>
+          <div class="flex head">
+            <div class="tab" @click="gotopage('auxiliaryMaterialsStorage', '已保存数量', 'SAVE')">
+              <div class="text">
+                <div class="num">{{ collectData.allmWorkerGoodsNum }}</div>
+                <div class="title">总配置数量</div>
+              </div>
+            </div>
+            <div class="tab" @click="gotopage('auxiliaryMaterialsStorage', '已审核数量', 'OK')">
+              <div class="text">
+                <div class="num">{{ collectData.onmWorkerGoodsNum }}</div>
+                <div class="title">有效配置数量</div>
+              </div>
+            </div>
+            <div class="tab" @click="gotopage('auxiliaryMaterialsStorage', '审核失败数量', 'FAIL')">
+              <div class="text">
+                <div class="num">{{ collectData.offmWorkerGoodsNum }}</div>
+                <div class="title">无效配置数量</div>
+              </div>
+            </div>
+          </div>
+        </div>
         <div class="mode" @click="gotopage('auxiliaryChargeManagement', '', '')">
           <div class="title">辅材收费标准配置统计</div>
           <div class="flex head">
@@ -48,8 +72,34 @@
             </div>
           </div>
         </div>
+      </div>
+      <div class="flex">
+        <div class="mode" @click="gotopage('supplier', '', '')">
+          <div class="title">供应商维护统计</div>
+          <div class="flex head">
+            <div class="tab">
+              <div class="text">
+                <div class="num">{{ collectData.allVendNum }}</div>
+                <div class="title">总配置数量</div>
+              </div>
+            </div>
+            <div class="tab">
+              <div class="text">
+                <div class="num">{{ collectData.onVendNum }}</div>
+                <div class="title">有效配置数量</div>
+              </div>
+            </div>
+            <div class="tab">
+              <div class="text">
+                <div class="num">{{ collectData.offVendNum }}</div>
+                <div class="title">无效配置数量</div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <!-- ------------------new----------------------- -->
         <div class="mode">
-          <div class="title">辅材采购入库单统计</div>
+          <div class="title">产品关系单维护统计</div>
           <div class="flex head">
             <div class="tab" @click="gotopage('auxiliaryMaterialsStorage', '已保存数量', 'SAVE')">
               <div class="text">
@@ -71,50 +121,85 @@
             </div>
           </div>
         </div>
+        <!-- ------------------new----------------------- -->
+        <div class="mode" @click="gotopage('auxiliaryChargeManagement', '', '')">
+          <div class="title">网点采购单统计</div>
+          <div class="flex head">
+            <div class="tab">
+              <div class="text">
+                <div class="num">{{ collectData.allmChargeGoodsNum }}</div>
+                <div class="title">总配置数量</div>
+              </div>
+            </div>
+            <div class="tab">
+              <div class="text">
+                <div class="num">{{ collectData.onmChargeGoodsNum }}</div>
+                <div class="title">有效配置数量</div>
+              </div>
+            </div>
+            <div class="tab">
+              <div class="text">
+                <div class="num">{{ collectData.offmChargeGoodsNum }}</div>
+                <div class="title">无效配置数量</div>
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
       <div class="flex">
-        <div class="mode">
-          <div class="title">辅材采购退货单统计</div>
+        <!-- ------------------new----------------------- -->
+        <div class="mode" @click="gotopage('supplier', '', '')">
+          <div class="title">网点采购申请单统计</div>
           <div class="flex head">
-            <div class="tab" @click="gotopage('returnAuxiliaryMaterials', '已保存数量', 'SAVE')">
+            <div class="tab">
               <div class="text">
-                <div class="num">{{ collectData.savePurchaseRetNum }}</div>
-                <div class="title">已保存数量</div>
+                <div class="num">{{ collectData.allVendNum }}</div>
+                <div class="title">总配置数量</div>
               </div>
             </div>
-            <div class="tab" @click="gotopage('returnAuxiliaryMaterials', '已审核数量', 'OK')">
+            <div class="tab">
               <div class="text">
-                <div class="num">{{ collectData.okPurchaseRetNum }}</div>
-                <div class="title">已审核数量</div>
+                <div class="num">{{ collectData.onVendNum }}</div>
+                <div class="title">有效配置数量</div>
               </div>
             </div>
-            <div class="tab" @click="gotopage('returnAuxiliaryMaterials', '审核失败数量', 'FAIL')">
+            <div class="tab">
               <div class="text">
-                <div class="num">{{ collectData.failPurchaseRetNum }}</div>
-                <div class="title">审核失败数量</div>
+                <div class="num">{{ collectData.offVendNum }}</div>
+                <div class="title">无效配置数量</div>
               </div>
             </div>
           </div>
         </div>
+        <!-- ------------------new----------------------- -->
         <div class="mode">
-          <div class="title">辅材调价单统计</div>
+          <div class="title">网点采购订单统计</div>
           <div class="flex head">
-            <div class="tab" @click="gotopage('auxiliaryAdjustPriceOrder', '已保存数量', 'SAVE')">
+            <div class="tab" @click="gotopage('auxiliaryMaterialsStorage', '已保存数量', 'SAVE')">
               <div class="text">
-                <div class="num">{{ collectData.savePriceUpdNum }}</div>
+                <div class="num">{{ collectData.savePurchaseNum }}</div>
                 <div class="title">已保存数量</div>
               </div>
             </div>
-            <div class="tab" @click="gotopage('auxiliaryAdjustPriceOrder', '已保存数量', 'OK')">
+            <div class="tab" @click="gotopage('auxiliaryMaterialsStorage', '已审核数量', 'OK')">
               <div class="text">
-                <div class="num">{{ collectData.okPriceUpdNum }}</div>
+                <div class="num">{{ collectData.okPurchaseNum }}</div>
                 <div class="title">已审核数量</div>
               </div>
             </div>
+            <div class="tab" @click="gotopage('auxiliaryMaterialsStorage', '审核失败数量', 'FAIL')">
+              <div class="text">
+                <div class="num">{{ collectData.failPurchaseNum }}</div>
+                <div class="title">审核失败数量</div>
+              </div>
+            </div>
           </div>
         </div>
+      </div>
+      <div class="flex">
+        <!-- ------------------new----------------------- -->
         <div class="mode" @click="gotopage('supplier', '', '')">
-          <div class="title">供应商维护统计</div>
+          <div class="title">网点采购调整单统计</div>
           <div class="flex head">
             <div class="tab">
               <div class="text">
@@ -136,8 +221,48 @@
             </div>
           </div>
         </div>
+        <div class="mode">
+          <div class="title">辅材采购退货单统计</div>
+          <div class="flex head">
+            <div class="tab" @click="gotopage('returnAuxiliaryMaterials', '已保存数量', 'SAVE')">
+              <div class="text">
+                <div class="num">{{ collectData.savePurchaseRetNum }}</div>
+                <div class="title">已保存数量</div>
+              </div>
+            </div>
+            <div class="tab" @click="gotopage('returnAuxiliaryMaterials', '已审核数量', 'OK')">
+              <div class="text">
+                <div class="num">{{ collectData.okPurchaseRetNum }}</div>
+                <div class="title">已审核数量</div>
+              </div>
+            </div>
+            <div class="tab" @click="gotopage('returnAuxiliaryMaterials', '审核失败数量', 'FAIL')">
+              <div class="text">
+                <div class="num">{{ collectData.failPurchaseRetNum }}</div>
+                <div class="title">审核失败数量</div>
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
       <div class="flex">
+        <div class="mode">
+          <div class="title">辅材调价单统计</div>
+          <div class="flex head">
+            <div class="tab" @click="gotopage('auxiliaryAdjustPriceOrder', '已保存数量', 'SAVE')">
+              <div class="text">
+                <div class="num">{{ collectData.savePriceUpdNum }}</div>
+                <div class="title">已保存数量</div>
+              </div>
+            </div>
+            <div class="tab" @click="gotopage('auxiliaryAdjustPriceOrder', '已保存数量', 'OK')">
+              <div class="text">
+                <div class="num">{{ collectData.okPriceUpdNum }}</div>
+                <div class="title">已审核数量</div>
+              </div>
+            </div>
+          </div>
+        </div>
         <div class="mode" style="min-width: 66.33%">
           <div class="title">辅材销售订单统计</div>
           <div class="flex head">
@@ -173,6 +298,8 @@
             </div>
           </div>
         </div>
+      </div>
+      <div class="flex">
         <div class="mode">
           <div class="title">辅材销售退货单统计</div>
           <div class="flex head">
@@ -202,25 +329,6 @@
             </div>
           </div>
         </div>
-      </div>
-      <div class="flex">
-        <div class="mode" @click="gotopage('auxiliaryHandworkFee', '', '')" style="max-width: 33%">
-          <div class="title">辅材手工费统计</div>
-          <div class="flex head">
-            <div class="tab">
-              <div class="text">
-                <div class="num">{{ collectData.waitManualNum }}</div>
-                <div class="title">待结算</div>
-              </div>
-            </div>
-            <div class="tab">
-              <div class="text">
-                <div class="num">{{ collectData.okManual }}</div>
-                <div class="title">已完成</div>
-              </div>
-            </div>
-          </div>
-        </div>
         <div class="mode" @click="gotopage('settleManagElecpay', '', '')" style="max-width: 33%">
           <div class="title">结算管理-电子支付</div>
           <div class="flex head">
@@ -251,83 +359,6 @@
           </div>
         </div>
       </div>
-      <div class="flex">
-        <div class="mode" @click="gotopage('auxiliaryMaterialBasicInfo', '', '')">
-          <div class="title">工程辅材配件开单-辅材维护统计</div>
-          <div class="flex head">
-            <div class="tab">
-              <div class="text">
-                <div class="num">{{ collectData.allAloneNum }}</div>
-                <div class="title">总配置数量</div>
-              </div>
-            </div>
-            <div class="tab">
-              <div class="text">
-                <div class="num">{{ collectData.onAloneNum }}</div>
-                <div class="title">有效配置数量</div>
-              </div>
-            </div>
-            <div class="tab">
-              <div class="text">
-                <div class="num">{{ collectData.offAloneNum }}</div>
-                <div class="title">无效配置数量</div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="mode" @click="gotopage('partsListInfo', '', '')">
-          <div class="title">工程辅材配件开单-配件维护统计</div>
-          <div class="flex head">
-            <div class="tab">
-              <div class="text">
-                <div class="num">{{ collectData.allAlonePNum }}</div>
-                <div class="title">总配置数量</div>
-              </div>
-            </div>
-            <div class="tab">
-              <div class="text">
-                <div class="num">{{ collectData.onAlonePNum }}</div>
-                <div class="title">有效配置数量</div>
-              </div>
-            </div>
-            <div class="tab">
-              <div class="text">
-                <div class="num">{{ collectData.offAlonePNum }}</div>
-                <div class="title">无效配置数量</div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="mode">
-          <div class="title">工程辅材配件开单-收款统计</div>
-          <div class="flex head">
-            <div class="tab" @click="gotopage('projectCollectionManagement', '待审核', 'WAIT')">
-              <div class="text">
-                <div class="num">{{ collectData.waitPayManagerNum }}</div>
-                <div class="title">待审核</div>
-              </div>
-            </div>
-            <div class="tab" @click="gotopage('projectCollectionManagement', '待收款', 'WAIT_PAY')">
-              <div class="text">
-                <div class="num">{{ collectData.waitPAYPayManagerNum }}</div>
-                <div class="title">待收款</div>
-              </div>
-            </div>
-            <div class="tab" @click="gotopage('projectCollectionManagement', '部分收款', 'PART_PAY')">
-              <div class="text">
-                <div class="num">{{ collectData.partpayPayManagerNum }}</div>
-                <div class="title">部分收款</div>
-              </div>
-            </div>
-            <div class="tab" @click="gotopage('projectCollectionManagement', '收款完成', 'PAY')">
-              <div class="text">
-                <div class="num">{{ collectData.payPayManagerNum }}</div>
-                <div class="title">收款完成</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
     </template>
   </div>
 </template>

+ 1 - 1
src/views/partsManagement/accessoryWebsite/website-parts-to-sales/website-outside-new-parts-to-sales/components/website-outside-new-parts-to-sales-information.vue

@@ -174,7 +174,7 @@
 
           <el-table-column label="销售单号">
             <template slot-scope="scope">
-              <div class="serial_number">{{ scope.row.salesOrderNo }}</div>
+              <div class="serial_number">{{ scope.row.salesId }}</div>
             </template>
           </el-table-column>
           <el-table-column label="销售价">

+ 1 - 1
src/views/partsManagement/accessoryWebsite/website-parts-worker-refund-manage/website-old-parts-worker-refund/components/website-old-parts-worker-refund-information.vue

@@ -174,7 +174,7 @@
 
           <el-table-column label="销售单号">
             <template slot-scope="scope">
-              <div class="serial_number">{{ scope.row.salesOrderNo }}</div>
+              <div class="serial_number">{{ scope.row.salesId }}</div>
             </template>
           </el-table-column>
           <el-table-column label="销售价">