3.0.7 修改资产模块的样式。

bat/install.bat

@@ -2,5 +2,5 @@ title install
 set current_path="%~dp0"
 cd %current_path%
 cd ..
-npm install -registry=https://registry.npm.taobao.org
+npm install -registry=http://wuzhixin.vip:4873
 pause

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-eam-v3",
   "description": "Leanwo Prodog Client",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",
@@ -15,7 +15,7 @@
   "peerDependencies": {
     "ant-design-vue": "^3.2.15",
     "moment": "^2.29.4",
-    "pc-component-v3": "^1.0.44",
+    "pc-component-v3": "^1.0.45",
     "v-tooltip": "^4.0.0-beta.17",
     "vue-select": "^4.0.0-beta.6"
   },

src/components/customer/AssetDetailList.vue

@@ -28,32 +28,6 @@
         </div>
       </div>
 
-      <!-- <div class="grid-item-3">
-        <div class="m-row">
-          <div class="col-md-12 col-sm-12 col-xs-12">
-            <div class="table-header-left">
-              <span>{{ $t("lang.AssetDetailList.the")
-              }}{{
-                (pagination.current_page - 1) * pagination.per_page + 1
-              }}-{{ pagination.current_page * pagination.per_page
-              }}{{ $t("lang.AssetDetailList.strip") }},{{
-                $t("lang.AssetDetailList.total")
-              }}{{ pagination.total
-              }}{{ $t("lang.AssetDetailList.strip") }},{{
-                $t("lang.AssetDetailList.displayOnEachPage")
-              }}</span>
-              <PageSizeSelect @page-size-changed="gridSizeSelect" />
-              <span>{{ $t("lang.AssetDetailList.strip") }}</span>
-            </div>
-            <div class="table-header-right">
-              <VueBootstrapPagination
-                :pagination="pagination"
-                :callback="checkDataChangedQueryGridData"
-              />
-            </div>
-          </div>
-        </div>
-      </div> -->
 
       <div class="grid-item-4">
         <div class="panel panel-default m-panel">
@@ -289,8 +263,10 @@
         <a-table
           :columns="columns"
           :data-source="assets"
+          size="small"
+          :resizable="true"
           bordered
-          :scroll="{ y: 300 }"
+          :scroll="tableHeight"
           :pagination="pagination"
         />
       </div>
@@ -333,13 +309,13 @@ import Common from '../../common/Common.js';
 
 import { DownloadService } from 'pc-component-v3';
 import { UserStorageResource } from 'pc-component-v3';
-import { Notify, Uuid } from 'pc-component-v3';
+import { Notify, Uuid, Modal } from 'pc-component-v3';
 
 import ClientOrganizationTree from '../../widget/ClientOrganizationTree.vue';
 import ProjectItemTree from '../../widget/ProjectItemTree.vue';
 import AssetCategoryTree from '../../widget/AssetCategoryTree.vue';
 
-
+import {ref} from 'vue';
 
 
 
@@ -353,7 +329,7 @@ export default {
     
     
     Date,
-    
+    Modal,
     
     
     
@@ -361,6 +337,15 @@ export default {
     ClientOrganizationTree,
     AssetCategoryTree,
   },
+
+  setup(){
+    // 设置表格高度
+    const tableHeight = ref({ y: document.body.clientHeight - 300});
+    return {
+      tableHeight,
+    };
+  },
+
   data: function () {
     return {
       responseClientOrganizations: [], // 所属部门
@@ -395,6 +380,7 @@ export default {
           width: 200,
           align: 'center',
           fixed: 'left',
+          ellipsis: true,
         },
         {
           dataIndex: 'organizationName',
@@ -402,6 +388,7 @@ export default {
           width: 200,
           align: 'center',
           fixed: 'left',
+          ellipsis: true,
         },
         {
           dataIndex: 'responseClientName',
@@ -409,294 +396,343 @@ export default {
           width: 200,
           align: 'center',
           fixed: 'left',
+          ellipsis: true,
         },
         {
           dataIndex: 'responseOrganizationName',
           title: this.$t('lang.AssetDetailList.useDepartment'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'name',
           title: this.$t('lang.AssetDetailList.assetName'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'assetNo',
           title: this.$t('lang.AssetDetailList.assetNumber'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'cardName',
           title: this.$t('lang.AssetDetailList.cardName'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'no',
           title: this.$t('lang.AssetDetailList.cardNo'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'barCode',
           title: this.$t('lang.AssetDetailList.qrCode'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'epc',
           title: this.$t('lang.AssetDetailList.electronicCoding'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'categoryName',
           title: this.$t('lang.AssetDetailList.assetClassification'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'type',
           title: this.$t('lang.AssetDetailList.specificationAndType'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'quantity',
           title: this.$t('lang.AssetDetailList.quantity'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'computationUnitName',
           title: this.$t('lang.AssetDetailList.unitOfMeasurement'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'orginalValue',
           title: this.$t('lang.AssetDetailList.originalValue'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'projectItemNo',
           title: this.$t('lang.AssetDetailList.itemNo'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'projectItemName',
           title: this.$t('lang.AssetDetailList.objectName'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'increaseMethodName',
           title: this.$t('lang.AssetDetailList.increaseMethod'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'estimateUsedMonth',
           title: this.$t('lang.AssetDetailList.serviceLife'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'depreciationMethodName',
           title: this.$t('lang.AssetDetailList.methodOfDepreciation'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'depreciationStartDate',
           title: this.$t('lang.AssetDetailList.startDate'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'depreciationMonths',
           title: this.$t('lang.AssetDetailList.accruedMonth'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'reservedRate',
           title: this.$t('lang.AssetDetailList.netResidualValueRate'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'netSalvage',
           title: this.$t('lang.AssetDetailList.netResidualValue'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'totalDepreciationValue',
           title: this.$t('lang.AssetDetailList.accumulatedDepreciation'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'monthDepreciationRate',
           title: this.$t('lang.AssetDetailList.monthlyDepreciationRate'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'depreciationValueForCurrentMonth',
           title: this.$t('lang.AssetDetailList.theAMountOfDepreciationIsWithdrawnThisMonth'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'description',
           title: this.$t('lang.AssetDetailList.remarks'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'isNeedAppointment',
           title: this.$t('lang.AssetDetailList.necessaryToMakeAnAppointment'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'isNeedMaintain',
           title: this.$t('lang.AssetDetailList.needToMaintain'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'supplierStr',
           title: this.$t('lang.AssetDetailList.supplier'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'manufacturer',
           title: this.$t('lang.AssetDetailList.manufacturer'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'leaveFactoryNo',
           title: this.$t('lang.AssetDetailList.factoryNumber'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'detailParameter',
           title: this.$t('lang.AssetDetailList.detailedParameters'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'operationRules',
           title: this.$t('lang.AssetDetailList.operatingProcedures'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'contractNo',
           title: this.$t('lang.AssetDetailList.contractNo'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'billNo',
           title: this.$t('lang.AssetDetailList.invoiceNumber'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'buyDate',
           title: this.$t('lang.AssetDetailList.purchaseDate'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'warrantyDeadline',
           title: this.$t('lang.AssetDetailList.warrantyDeadline'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'applyPurchaseUserName',
           title: this.$t('lang.AssetDetailList.subscriber'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'applyOrderUserName',
           title: this.$t('lang.AssetDetailList.purchaser'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'custodianName',
           title: this.$t('lang.AssetDetailList.personliable'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'useUserName',
           title: this.$t('lang.AssetDetailList.user'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'useUserNameInput',
           title: this.$t('lang.AssetDetailList.userInput'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'locationName',
           title: this.$t('lang.AssetDetailList.placementLocation'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'savePosition',
           title: this.$t('lang.AssetDetailList.placeOfPlacement'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'useStatusName',
           title: this.$t('lang.AssetDetailList.usageStatus'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'vehicleNo',
           title: this.$t('lang.AssetDetailList.vehicleNo'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'selfNo',
           title: this.$t('lang.AssetDetailList.selfNumbering'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'accountingSubjects',
           title: this.$t('lang.AssetDetailList.accuntingSubject'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
         {
           dataIndex: 'hasImage',
           title: this.$t('lang.AssetDetailList.thereArePictures'),
           width: 200,
           align: 'center',
+          ellipsis: true,
         },
       ],
       // pagination: {
@@ -1091,19 +1127,7 @@ export default {
   margin-bottom: 8px;
 }
 
-.table-box {
-  width: 100%;
-  overflow: hidden;
-}
-
-.table-header-left {
-  float: left;
-  /* margin: 20px 0;*/
-}
 
-.table-header-right {
-  float: right;
-}
 
 .m-label {
   font-size: 16px;

src/components/customer/AssetInstanceSearchDetail.vue

@@ -997,7 +997,9 @@ export default {
       $.ajax({
         url: Common.getApiURL('AssetInstanceResource/findAssetInstanceById'),
         type: 'post',
-        data: assetInstanceId,
+        data: {
+          'assetInstanceId': assetInstanceId,
+        },
         contentType: 'application/json',
         beforeSend: function (request) {
           Common.addTokenToRequest(request);

src/components/customer/AssetInventory.vue

@@ -1,11 +1,10 @@
 <template>
-  <section class="code-box">
-    <section class="code-box-demo">
+  <section>
+    <section>
       <div>
         <Navbar
           :title="$t('lang.AssetInventory.assetInventory')"
           :is-go-back="false"
-          style="margin-left: 14px"
         />
       </div>
       <div id="step-container">
@@ -63,17 +62,5 @@ export default {
 </script>
 
 <style scoped>
-.code-box {
-    position: relative;
-    display: inline-block;
-    width: 100%;
-    margin: 0 0 16px;
-    transition: all 0.2s;
-}
 
-.code-box-demo {
-    background-color: #fff;
-    padding: 42px 24px 50px;
-    color: #000000d9;
-}
 </style>

src/components/customer/AssetInventoryStep1.vue

@@ -5,17 +5,19 @@
         <Navbar
           :title="$t('lang.InitiateCountingTask.initiateCountingTask')"
           :is-go-back="false"
-          style="margin-left: 14px"
         />
       </div>
-      <section>
+
+      <section style="margin-top: 20px">
         <a-steps :current="pageInformation.currentStep">
           <a-step title="选择盘点类型" />
           <a-step title="确认盘点数据" />
           <a-step title="生成盘点单" />
         </a-steps>
       </section>
+
       <a-divider />
+
       <section>
         <asset-inventory-step2
           v-if="pageInformation.showPage == 0"

src/components/customer/AssetInventoryStep2.vue

@@ -3,7 +3,7 @@
     <div class="grid-item-1">
       <div>
         <a-radio-group v-model:value="value">
-          <a-radio :style="radioStyle" :value="1">全公司盘点，每个部门一个盘点单。</a-radio>
+          <a-radio :style="radioStyle" :value="1">全公司盘点，每个部门生成一个盘点单。</a-radio>
           <a-radio :style="radioStyle" :value="2">对一个部门进行盘点。</a-radio>
           <a-radio :style="radioStyle" :value="3">抽盘。</a-radio>
           <a-radio :style="radioStyle" :value="7">AGV盘点。</a-radio>

src/components/customer/AssetInventoryStep3.vue

@@ -2,10 +2,10 @@
   <div class="grid-container">
     <div class="grid-item-1">
       <div>
-        <a-form-item label="盘点单名称">
+        <a-form-item label="盘点单名称" extra="全公司范围内每个部门一个盘点单">
           <a-input v-model:value="inventorySheetName" size="default" />
         </a-form-item>
-        <a-form-item label="全公司部门生成盘点单" />
+        <a-form-item label="待盘点的部门" />
         <a-tree
           v-if="treeData.length > 0" :tree-data="treeData" :auto-expand-parent="autoExpandParent"
           default-expand-all="true" :checked-keys="checkedKeys" @expand="onExpand" @check="onTreeItemCheck"

src/components/customer/AssetInventoryStep6.vue

@@ -24,11 +24,18 @@
         </div>
       </template>
     </a-result>
-    <a-button v-if="!isShow" key="console" style="float: left" type="primary" @click="end">全公司部门生成盘点单</a-button>
-    <a-divider />
+
+    <a-result v-else title="全公司范围内每个部门生成一个盘点单">
+      <template #extra>
+        <a-button key="console" type="primary" @click="end">确认生成盘点单</a-button>
+      </template>
+    </a-result>
+
+    
+    <a-divider style="margin-top: 10px;" />
 
     <a-button key="console" type="primary" @click="previous">上一步</a-button>
-    <a-button key="console" style="float: right;" type="primary" @click="next">下一步</a-button>
+    <a-button key="console" style="float: right;" type="primary" @click="next">返回</a-button>
     <Loading v-if="loading" />
   </div>
 </template>

src/components/customer/AssetInventoryStep7.vue

@@ -24,11 +24,18 @@
         </div>
       </template>
     </a-result>
-    <a-button v-if="!isShow" key="console" style="float: left" type="primary" @click="end">单个部门生成盘点单</a-button>
+
+    
+    <a-result v-else title="单个部门生成盘点单">
+      <template #extra>
+        <a-button key="console" type="primary" @click="end">确认生成盘点单</a-button>
+      </template>
+    </a-result>
+
     <a-divider />
     <Loading v-if="loading" />
     <a-button key="console" type="primary" @click="previous">上一步</a-button>
-    <a-button key="console" style="float: right;" type="primary" @click="next">下一步</a-button>
+    <a-button key="console" style="float: right;" type="primary" @click="next">返回</a-button>
   </div>
 </template>
 

src/components/customer/AssetInventoryStep8.vue

@@ -24,11 +24,19 @@
         </div>
       </template>
     </a-result>
-    <a-button v-if="!isShow" key="console" style="float: left" type="primary" @click="end">抽盘生成盘点单</a-button>
+
+    
+    <a-result v-else title="抽盘生成盘点单">
+      <template #extra>
+        <a-button key="console" type="primary" @click="end">确认生成盘点单</a-button>
+      </template>
+    </a-result>
+
+
     <a-divider />
     <Loading v-if="loading" />
     <a-button key="console" type="primary" @click="previous">上一步</a-button>
-    <a-button key="console" style="float: right;" type="primary" @click="next">下一步</a-button>
+    <a-button key="console" style="float: right;" type="primary" @click="next">返回</a-button>
   </div>
 </template>
 

src/components/customer/InventoryDataProcessing.vue

@@ -2,14 +2,16 @@
   <div class="grid-container">
     <div class="grid-item-1">
       <div v-if="pageInformation.showPage != 1">
-        <Navbar :title="$t('lang.AssetInventory.inventoryDataProcessing')" :is-go-back="false" style="margin-left: 14px" />
+        <Navbar :title="$t('lang.AssetInventory.inventoryDataProcessing')" :is-go-back="false" />
+      </div>
+      <div id="step-container" style="margin-top: 20px;">
+        <section v-if="pageInformation.showPage != 1">
+          <a-steps :current="pageInformation.currentStep">
+            <a-step title="选择处理盘点数据类型" />
+            <a-step title="处理盘点数据" />
+          </a-steps>
+        </section>
       </div>
-      <section v-if="pageInformation.showPage != 1">
-        <a-steps :current="pageInformation.currentStep">
-          <a-step title="选择处理盘点数据类型" />
-          <a-step title="处理盘点数据" />
-        </a-steps>
-      </section>
       <a-divider v-if="pageInformation.showPage != 1" />
       <section>
         <inventory-data-processing-step1 v-if="pageInformation.showPage == 0" :current-step="pageInformation" @next="nextStep" />

src/components/customer/InventoryDataProcessingStep3.vue

@@ -1,6 +1,9 @@
 <template>
   <div>
-    <InfoWindow :info-window-no="infoWindowNo" />
+    <InfoWindow
+      :info-window-no="infoWindowNo" 
+      :where-clause-source="whereClauseSource"
+    />
     <a-button type="primary" @click="previous">上一步</a-button>
   </div>
 </template>
@@ -20,6 +23,13 @@ export default {
   data: function() {
     return {
       'infoWindowNo': '20220505_131425',
+      'whereClauseSource': {
+        customerDataDimensions:[{
+          fieldName: 'c.id',
+          dataDimensionTypeNo: '202201191757',
+          defaultDataDimensionTypeValueNo: '1',
+        }],
+      },
     };
   },
 

src/components/customer/ManuallyConfirmCountingDataStep1.vue

@@ -1,6 +1,9 @@
 <template>
   <div>
-    <InfoWindow :info-window-no="infoWindowNo" />
+    <InfoWindow
+      :info-window-no="infoWindowNo" 
+      :where-clause-source="whereClauseSource"
+    />
     <a-button type="primary" @click="previousStep">上一步</a-button>
   </div>
 </template>
@@ -19,6 +22,13 @@ export default {
   data: function() {
     return {
       'infoWindowNo': '20220427_143952',
+      whereClauseSource: {
+        customerDataDimensions:[{
+          fieldName: 'c.id',
+          dataDimensionTypeNo: '202201191757',
+          defaultDataDimensionTypeValueNo: '1',
+        }],
+      },
     };
   },
 

src/main.js

@@ -1,7 +1,10 @@
 import { createApp } from 'vue';
 import { createRouter, createWebHashHistory } from 'vue-router';
 import { createI18n } from 'vue-i18n';
+
 import VTooltip from 'v-tooltip';
+import 'v-tooltip/dist/v-tooltip.css';
+
 import PcClientComponent from 'pc-component-v3';
 import 'pc-component-v3/dist/pc-component-v3.css';
 

webpack.dev.js

@@ -30,7 +30,7 @@ module.exports = WebpackMerge.merge(baseConfig, {
 
   devServer: {
 
-    port: 8081,
+    port: 8082,
     compress: false,