抽盘增加责任人保管人自编号筛选查询

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-eam-v3",
   "description": "Leanwo Prodog Client",
-  "version": "3.0.34",
+  "version": "3.0.35",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",

src/components/customer/AssetInventoryStep5.vue

@@ -3,14 +3,22 @@
     <div class="grid-container">
       <div class="grid-item-row1-column1">
         <div class="btn-group m-panel" role="group">
-          <button type="button" class="btn btn-success" @click="getAssetInstance(false)">
+          <button
+            type="button"
+            class="btn btn-success"
+            @click="getAssetInstance(false)"
+          >
             {{ $t("lang.AssetInventorySearch.query") }}
           </button>
 
           <!-- <button type="button" class="btn btn-info" @click="generateAssetInventoryLine">
             加入盘点清单(已选择:{{ checkedIds.length }})
           </button> -->
-          <button type="button" class="btn btn-info" @click="openAssetInventoryLine">
+          <button
+            type="button"
+            class="btn btn-info"
+            @click="openAssetInventoryLine"
+          >
             查看盘点清单(已选择:{{ assetInstancesTempory.length }})
           </button>
           <button type="button" class="btn btn-danger" @click="clearFilter">
@@ -37,65 +45,113 @@
       <div class="grid-item-row3-column1">
         <div>
           <div class="panel panel-default m-panel">
-            <div class="panel-heading" @click="type == 1 ? (type = 0) : (type = 1)">
+            <div
+              class="panel-heading"
+              @click="type == 1 ? (type = 0) : (type = 1)"
+            >
               {{ $t("lang.AssetInventorySearch.ownerDepartment") }}
             </div>
             <div v-show="type == 1" class="panel-body">
-              <ClientOrganizationTree ref="organization" :ids="assetInventoryOrganizationIds" @select-changed="selectChanged" />
+              <ClientOrganizationTree
+                ref="organization"
+                :ids="assetInventoryOrganizationIds"
+                @select-changed="selectChanged"
+              />
             </div>
           </div>
 
           <div class="panel panel-default m-panel">
-            <div class="panel-heading" @click="type == 3 ? (type = 0) : (type = 3)">
+            <div
+              class="panel-heading"
+              @click="type == 3 ? (type = 0) : (type = 3)"
+            >
               {{ $t("lang.AssetInventorySearch.useDepartment") }}
             </div>
             <div v-show="type == 3" class="panel-body">
               <ClientOrganizationTree
-                ref="responseOrganization" :ids="assetInventoryResponseOrganizationIds"
+                ref="responseOrganization"
+                :ids="assetInventoryResponseOrganizationIds"
                 @select-changed="selectChanged"
               />
             </div>
           </div>
 
           <div class="panel panel-default m-panel">
-            <div class="panel-heading" @click="type == 2 ? (type = 0) : (type = 2)">
+            <div
+              class="panel-heading"
+              @click="type == 2 ? (type = 0) : (type = 2)"
+            >
               {{ $t("lang.AssetInventorySearch.category") }}
             </div>
             <div v-show="type == 2" class="panel-body">
               <div>
-                <AssetCategoryTree ref="assetCategory" :ids="assetInventoryCategoryIds" @select-changed="selectChanged" />
+                <AssetCategoryTree
+                  ref="assetCategory"
+                  :ids="assetInventoryCategoryIds"
+                  @select-changed="selectChanged"
+                />
               </div>
             </div>
           </div>
 
           <div class="panel panel-default m-panel">
-            <div class="panel-heading" @click="type == 4 ? (type = 0) : (type = 4)">
+            <div
+              class="panel-heading"
+              @click="type == 4 ? (type = 0) : (type = 4)"
+            >
               {{ $t("lang.AssetInventorySearch.project") }}
             </div>
             <div v-show="type == 4" class="panel-body">
               <div>
-                <ProjectItemTree ref="projectItem" :ids="assetInventoryProjectItemIds" @select-changed="selectChanged" />
+                <ProjectItemTree
+                  ref="projectItem"
+                  :ids="assetInventoryProjectItemIds"
+                  @select-changed="selectChanged"
+                />
               </div>
             </div>
           </div>
         </div>
         <div>
           <div class="panel panel-default m-panel">
-            <div class="panel-heading" @click="type == 6 ? (type = 0) : (type = 6)">
+            <div
+              class="panel-heading"
+              @click="type == 6 ? (type = 0) : (type = 6)"
+            >
               其他筛选条件
             </div>
             <div v-show="type == 6" class="panel-body">
               <div>资产价值</div>
-              <div class="form-group">
-                <input v-model="filter.orginalValue1" autocomplete="off" type="number" class="form-control" />
+              <div>
+                <input
+                  v-model="filter.orginalValue1"
+                  style="
+                    width: 120px;
+                    border: 1px solid #ccc;
+                    border-radius: 4px;
+                  "
+                  autocomplete="off"
+                  type="number"
+                />
+                <label class="control-label">~</label>
+                <input
+                  v-model="filter.orginalValue2"
+                  style="
+                    width: 120px;
+                    border: 1px solid #ccc;
+                    border-radius: 4px;
+                  "
+                  autocomplete="off"
+                  type="number"
+                />
               </div>
 
-              <div class="form-group">
+              <!-- <div class="form-group">
                 <label class="control-label">~</label>
                 <input v-model="filter.orginalValue2" autocomplete="off" type="number" class="form-control" />
-              </div>
+              </div> -->
 
-              <div>上一次抽盘时间</div>
+              <!-- <div>上一次抽盘时间</div>
               <div class="form-group">
                 <div class="input-group">
                   <Date
@@ -111,12 +167,46 @@
                     v-model="filter.lastRandomlyCheckDate2"
                   />
                 </div>
-              </div>
+              </div> -->
+              <div>责任人</div>
+              <SearchWidget
+                :info-window-no="userWindowNo"
+                :field="custodianNameField"
+                :field-value="custodianNameFieldValue"
+                :display-name="custodianNameField.listDisplayFieldName"
+                :where-clause-source="custodianIdWhereClauseSource"
+                @value-changed="custodianNameValueChanged"
+              />
+              <div>保管人</div>
+              <SearchWidget
+                :info-window-no="userWindowNo"
+                :field="userField"
+                :field-value="userFieldValue"
+                :display-name="userField.listDisplayFieldName"
+                :where-clause-source="userIdWhereClauseSource"
+                @value-changed="userValueChanged"
+              />
 
               <div>放置位置</div>
               <SearchWidget
-                :info-window-no="'109494'" :field-value="locationFieldValue" :display-name="locationField.listFieldNames"
-                :where-clause-source="whereClauseSource" @value-changed="locationValueChanged"
+                :info-window-no="locationWindowNo"
+                :field="locationField"
+                :field-value="locationFieldValue"
+                :display-name="locationField.listDisplayFieldName"
+                :where-clause-source="whereClauseSource"
+                @value-changed="locationValueChanged"
+              />
+              <div>图号</div>
+              <input
+                v-model="filter.selfNo"
+                style="
+                  width: 250px;
+                  height: 32px;
+                  border: 1px solid #ccc;
+                  border-radius: 4px;
+                "
+                autocomplete="off"
+                @input="selfNoChange"
               />
             </div>
           </div>
@@ -130,7 +220,12 @@
                 {{ $t("lang.AssetInventorySearch.serialNumber") }}
               </th>-->
               <th style="width: 50px">
-                <input autocomplete="off" type="checkbox" :checked="allChecked" @click="isAllChecked()" />
+                <input
+                  autocomplete="off"
+                  type="checkbox"
+                  :checked="allChecked"
+                  @click="isAllChecked()"
+                />
               </th>
               <th style="width: 130px">
                 {{ $t("lang.AssetInventorySearch.ownerClient") }}
@@ -177,6 +272,12 @@
               <th style="width: 100px">
                 {{ $t("lang.AssetInventorySearch.user") }}
               </th>
+              <th style="width: 100px">
+                {{ $t("lang.AssetInventorySearch.custodianName") }}
+              </th>
+              <th style="width: 100px">
+                {{ $t("lang.AssetInventorySearch.depositoryUserName") }}
+              </th>
               <th style="width: 100px">
                 {{ $t("lang.AssetInventorySearch.usageStatus") }}
               </th>
@@ -198,7 +299,11 @@
             </tr>
           </thead>
           <tbody>
-            <tr v-for="(assetInstance) in assetInstances" :key="assetInstance.id" @dblclick="openCurdWindow(assetInstance)">
+            <tr
+              v-for="assetInstance in assetInstances"
+              :key="assetInstance.id"
+              @dblclick="openCurdWindow(assetInstance)"
+            >
               <!-- <td>
                 {{
                   index +
@@ -208,7 +313,13 @@
                 }}
               </td>-->
               <td>
-                <input id="assetInstance.id" v-model="assetInstancesTempory" autocomplete="off" type="checkbox" :value="assetInstance" />
+                <input
+                  id="assetInstance.id"
+                  v-model="assetInstancesTempory"
+                  autocomplete="off"
+                  type="checkbox"
+                  :value="assetInstance"
+                />
               </td>
               <td>{{ assetInstance.clientName }}</td>
               <td>{{ assetInstance.organizationName }}</td>
@@ -225,6 +336,8 @@
               <td>{{ assetInstance.locationName }}</td>
               <td>{{ assetInstance.computationUnitName }}</td>
               <td>{{ assetInstance.useUserName }}</td>
+              <td>{{ assetInstance.custodianName }}</td>
+              <td>{{ assetInstance.depositoryUserName }}</td>
               <td>{{ assetInstance.useStatusName }}</td>
               <td>{{ assetInstance.useUserNameInput }}</td>
               <td>{{ assetInstance.vehicleNo }}</td>
@@ -260,14 +373,19 @@
             <span>{{ $t("lang.AssetInventorySearch.strip") }}</span>
           </div>
           <div class="pull-right">
-            <VueBootstrapPagination :pagination="pagination" :callback="pageStartChanged" />
+            <VueBootstrapPagination
+              :pagination="pagination"
+              :callback="pageStartChanged"
+            />
           </div>
         </div>
       </div>
       <div class="grid-item-row5-column2">
         <div>
           <a-button type="primary" @click="previous">上一步</a-button>
-          <a-button style="float: right;" type="primary" @click="next">下一步</a-button>
+          <a-button style="float: right" type="primary" @click="next">
+            下一步
+          </a-button>
         </div>
       </div>
     </div>
@@ -368,7 +486,10 @@
             </tr>
           </thead>
           <tbody>
-            <tr v-for="(assetInstance) in assetInstancesTempory" :key="assetInstance.id">
+            <tr
+              v-for="assetInstance in assetInstancesTempory"
+              :key="assetInstance.id"
+            >
               <!-- <td>
                 {{
                   index +
@@ -390,7 +511,11 @@
               <!-- <td>{{ assetInstance.type }}</td> -->
               <td>{{ assetInstance.categoryName }}</td>
               <td>
-                <button type="button" class="btn btn-danger" @click="deleteCountList(assetInstance.id)">
+                <button
+                  type="button"
+                  class="btn btn-danger"
+                  @click="deleteCountList(assetInstance.id)"
+                >
                   {{ $t("lang.AssetInventorySearch.delete") }}
                 </button>
               </td>
@@ -427,31 +552,17 @@ import AssetCategoryTree from '../../widget/AssetCategoryTree.vue';
 
 import { Notify, Uuid } from 'pc-component-v3';
 
-
-
-
-
-
-
 export default {
-
   components: {
-    
-    
     Date,
-    
-    
-    
-    
-    
-    
+
     ProjectItemTree,
     AssetCategoryTree,
     ClientOrganizationTree,
   },
   // 定义抛出的事件名称
   emits: ['previous', 'next'],
-  data: function() {
+  data: function () {
     return {
       clientOrganizations: [], // 所属部门
       responseClientOrganizations: [], // 使用部门
@@ -463,8 +574,11 @@ export default {
         //抽盘过滤
         orginalValue1: null,
         orginalValue2: null,
-        lastRandomlyCheckDate1: '',
-        lastRandomlyCheckDate2: '',
+        // lastRandomlyCheckDate1: '',
+        // lastRandomlyCheckDate2: '',
+        selfNo: null,
+        custodianId: null,
+        depositoryUserId: null,
       },
       additionalHql: '',
       pagination: {
@@ -482,36 +596,76 @@ export default {
       assetInventoryResponseOrganizationIds: [], // 盘点单中已经选中的所属部门
       assetInventoryCategoryIds: [], // 盘点单中已经选中的资产类别
       assetInventoryProjectItemIds: [], // 盘点单中已经选择的项目
-
+      locationWindowNo: '109494',
       locationField: {
         name: '',
-        listFieldNames: 'name',
+        listDisplayFieldName: 'ar.name',
       },
       locationFieldValue: {
-        id: {},
+        id: null,
         displayValue: [''],
         fieldType: 'Key',
       },
-
-      checkedIds: [],
       whereClauseSource: {
-        customerDataDimensions: [{
-          fieldName: 'ar.client.id',
-          dataDimensionTypeNo: '202201191757',
-          defaultDataDimensionTypeValueNo: '1',
-        }],
+        customerDataDimensions: [
+          {
+            fieldName: 'ar.client.id',
+            dataDimensionTypeNo: '202201191757',
+            defaultDataDimensionTypeValueNo: '1',
+          },
+        ],
+      },
+      userWindowNo: '050408',
+      userField: {
+        name: '',
+        listDisplayFieldName: 'name',
+      },
+      userFieldValue: {
+        id: null,
+        displayValue: [''],
+        fieldType: 'Key',
+      },
+      custodianNameField: {
+        name: '',
+        listDisplayFieldName: 'name',
+      },
+      custodianNameFieldValue: {
+        id: null,
+        displayValue: [''],
+        fieldType: 'Key',
+      },
+      userIdWhereClauseSource: {
+        customerDataDimensions: [
+          {
+            fieldName: 'client.id',
+            dataDimensionTypeNo: '202201191757',
+            defaultDataDimensionTypeValueNo: '4',
+          },
+        ],
       },
+      custodianIdWhereClauseSource: {
+        customerDataDimensions: [
+          {
+            fieldName: 'client.id',
+            dataDimensionTypeNo: '202201191757',
+            defaultDataDimensionTypeValueNo: '4',
+          },
+        ],
+      },
+      checkedIds: [],
       loading: false,
       inventorySheetName: undefined, //盘点单名称
-      assetInstancesTempory: [],//盘点清单展示
+      assetInstancesTempory: [], //盘点清单展示
       modal1: false,
     };
   },
 
   computed: {
-    allChecked: function() {
+    allChecked: function () {
       for (
-        let index = 0, size = this.assetInstances.length; index < size; index++
+        let index = 0, size = this.assetInstances.length;
+        index < size;
+        index++
       ) {
         if (this.checkedIds.indexOf(this.assetInstances[index].id) < 0) {
           return false;
@@ -521,7 +675,7 @@ export default {
     },
   },
 
-  mounted: function() {
+  mounted: function () {
     var _self = this;
 
     _self.getAssetInventory();
@@ -529,25 +683,51 @@ export default {
     _self.fixedTableHeader();
 
     // 可调整表格列宽
-    _self.$nextTick(function() {
+    _self.$nextTick(function () {
       $('.fixed-table').resizableColumns();
     });
   },
   methods: {
+    // 选择责任人
+    custodianNameValueChanged: function (newResponsibilityFieldValue) {
+      console.log('1111111111');
+      this.custodianNameFieldValue = newResponsibilityFieldValue;
+      if (this.custodianNameFieldValue != null) {
+        this.filter.custodianId = this.custodianNameFieldValue.id;
+      } else {
+        this.filter.custodianId = null;
+      }
+    },
+    // 选择责保管人
+    userValueChanged: function (newResponsibilityFieldValue) {
+      this.userFieldValue = newResponsibilityFieldValue;
+      if (this.userFieldValue != null) {
+        this.filter.depositoryUserId = this.userFieldValue.id;
+      } else {
+        this.filter.depositoryUserId = null;
+      }
+    },
+    // 自编号为null
+    selfNoChange: function () {
+      const _self = this;
+      if (_self.filter.selfNo == '') {
+        _self.filter.selfNo = null;
+      }
+    },
     /**
      * 删除已选择的盘点清单
      */
-    deleteCountList: function(data){
+    deleteCountList: function (data) {
       var _self = this;
-      for(var i = 0 ; i < _self.assetInstancesTempory.length; i++){
-        if(_self.assetInstancesTempory[i].id == data){
-          _self.assetInstancesTempory.splice(i,1);
+      for (var i = 0; i < _self.assetInstancesTempory.length; i++) {
+        if (_self.assetInstancesTempory[i].id == data) {
+          _self.assetInstancesTempory.splice(i, 1);
           break;
         }
       }
 
-      for(var k = 0 ; k < _self.assetInstances.length; k++){
-        if(_self.assetInstances[k].id == data){
+      for (var k = 0; k < _self.assetInstances.length; k++) {
+        if (_self.assetInstances[k].id == data) {
           _self.assetInstances[k].checked = false;
           break;
         }
@@ -556,18 +736,24 @@ export default {
     /**
      * 查看已选择的盘点清单
      */
-    openAssetInventoryLine: function(){
+    openAssetInventoryLine: function () {
       var _self = this;
       _self.modal1 = true;
     },
-    next: function() {
+    next: function () {
       var _self = this;
-      if (_self.inventorySheetName == null || _self.inventorySheetName == undefined || _self.inventorySheetName ==
-          '') {
+      if (
+        _self.inventorySheetName == null ||
+        _self.inventorySheetName == undefined ||
+        _self.inventorySheetName == ''
+      ) {
         Notify.error('错误', '请填写盘点单名称', 1000);
         return;
       }
-      if (_self.assetInstancesTempory == null || _self.assetInstancesTempory.length < 1) {
+      if (
+        _self.assetInstancesTempory == null ||
+        _self.assetInstancesTempory.length < 1
+      ) {
         Notify.error('错误', '请至少选择一条盘点明细', 1000);
         return;
       }
@@ -580,7 +766,7 @@ export default {
         assetInstanceIds: assetInventoryLineSaveDtos,
       };
 
-      var data ={
+      var data = {
         currentStep: 2,
         showPage: 6,
         assetInventoryStep3: param,
@@ -588,20 +774,20 @@ export default {
       this.$emit('next', data);
     },
 
-    previous: function() {
-      var data ={
+    previous: function () {
+      var data = {
         currentStep: 0,
         showPage: 0,
         assetInventoryStep3: undefined,
       };
-      this.$emit('previous',data);
+      this.$emit('previous', data);
     },
     /**
-       * 查询盘点单DTO,
-       * 主要是获取资产盘点中的所属部门集合、使用部门集合、资产类别结合。
-       * @author yangzhijie 20200806
-       */
-    getAssetInventory: function() {
+     * 查询盘点单DTO,
+     * 主要是获取资产盘点中的所属部门集合、使用部门集合、资产类别结合。
+     * @author yangzhijie 20200806
+     */
+    getAssetInventory: function () {
       var _self = this;
 
       AssetInventoryResource.getOrganizationsAndOrganizationsAndCategory().then(
@@ -609,7 +795,7 @@ export default {
           _self.assetInventoryOrganizationIds = data.organizationIds;
 
           _self.assetInventoryResponseOrganizationIds =
-              data.responseOrganizationIds;
+            data.responseOrganizationIds;
 
           _self.assetInventoryCategoryIds = data.categoryIds;
 
@@ -639,20 +825,20 @@ export default {
       );
     },
     /**
-       * 执行全选/全不选
-       */
-    isAllChecked: function() {
+     * 执行全选/全不选
+     */
+    isAllChecked: function () {
       var _self = this;
       if (_self.allChecked == false) {
-        _self.assetInstances.forEach(function(item) {
-          if(!item.checked){
+        _self.assetInstances.forEach(function (item) {
+          if (!item.checked) {
             item.checked = true;
             _self.checkedIds.push(item.id);
             _self.assetInstancesTempory.push(item);
           }
         });
       } else {
-        _self.assetInstances.forEach(function(item) {
+        _self.assetInstances.forEach(function (item) {
           item.checked = false;
           let index = _self.checkedIds.indexOf(item.id);
           _self.checkedIds.splice(index, 1);
@@ -663,13 +849,13 @@ export default {
       const checkedIds = new Set(_self.checkedIds);
       _self.checkedIds = Array.from(checkedIds);
       const assetInstancesTempory = new Set(_self.assetInstancesTempory);
-      _self.assetInstancesTempory = Array.from(assetInstancesTempory);;
+      _self.assetInstancesTempory = Array.from(assetInstancesTempory);
     },
 
     /**
-       * 选择的房间发生了改变
-       */
-    locationValueChanged: function(newFieldValue) {
+     * 选择的房间发生了改变
+     */
+    locationValueChanged: function (newFieldValue) {
       this.locationFieldValue = newFieldValue;
       if (this.locationFieldValue != null) {
         this.filter.locationId = this.locationFieldValue.id;
@@ -678,16 +864,16 @@ export default {
       }
     },
 
-    selectChanged: function() {
+    selectChanged: function () {
       var _self = this;
       _self.getAssetInstance(false);
     },
 
     /**
-       * 根据界面选中的所属部门、使用部门、资产类别、项目查询资产清单
-       * @author yangzhijie 20200806
-       */
-    getAssetInstance: function(isPageChange) {
+     * 根据界面选中的所属部门、使用部门、资产类别、项目查询资产清单
+     * @author yangzhijie 20200806
+     */
+    getAssetInstance: function (isPageChange) {
       var _self = this;
 
       if (!isPageChange) {
@@ -698,7 +884,7 @@ export default {
       var projectItemIds = _self.$refs.projectItem.getSelectedIds();
       var organizationIds = _self.$refs.organization.getSelectedIds();
       var responseOrganizationIds =
-          _self.$refs.responseOrganization.getSelectedIds();
+        _self.$refs.responseOrganization.getSelectedIds();
       var categoryIds = _self.$refs.assetCategory.getSelectedIds();
 
       //_self.clearPageData();
@@ -721,7 +907,8 @@ export default {
         projectItemIds: projectItemIds,
         filter: _self.filter,
         range: {
-          start: (_self.pagination.current_page - 1) * _self.pagination.per_page,
+          start:
+            (_self.pagination.current_page - 1) * _self.pagination.per_page,
           length: _self.pagination.per_page,
         },
         inventoryStatus: 'RANDOM_STOCKTAKING',
@@ -742,41 +929,40 @@ export default {
       );
     },
 
-    changeAassetInstanceId: function(data){
+    changeAassetInstanceId: function (data) {
       var _self = this;
-      if(data.checked){
+      if (data.checked) {
         _self.assetInstancesTempory.push(data);
         _self.checkedIds.push(data.id);
-      }else{
-        for(var i = 0; i < _self.checkedIds.length;i++){
-          if(_self.checkedIds[i] == data.id){
-            _self.checkedIds.splice(i,1);
+      } else {
+        for (var i = 0; i < _self.checkedIds.length; i++) {
+          if (_self.checkedIds[i] == data.id) {
+            _self.checkedIds.splice(i, 1);
             i--;
           }
         }
-        for(var j = 0; j < _self.assetInstancesTempory.length;j++){
-          if(_self.assetInstancesTempory[j].id == data.id){
-            _self.assetInstancesTempory.splice(j,1);
+        for (var j = 0; j < _self.assetInstancesTempory.length; j++) {
+          if (_self.assetInstancesTempory[j].id == data.id) {
+            _self.assetInstancesTempory.splice(j, 1);
             j--;
           }
         }
       }
-
     },
 
     /**
-       * 重新绘制资产卡片
-       * @author YangZhiJie 20200806
-       */
-    redrawAssetInstance: function(data) {
+     * 重新绘制资产卡片
+     * @author YangZhiJie 20200806
+     */
+    redrawAssetInstance: function (data) {
       var _self = this;
       console.log(data);
       _self.assetInstances = data.dataList;
-      _self.assetInstances.forEach(function(item){
+      _self.assetInstances.forEach(function (item) {
         if (_self.checkedIds.indexOf(item.id) < 0) {
           item.checked = false;
           // _self.$set(item, 'checked', false);
-        }else {
+        } else {
           item.checked = true;
           // _self.$set(item, 'checked', true);
         }
@@ -794,10 +980,10 @@ export default {
     },
 
     /**
-       * 清空分页数据
-       * @author YangZhiJie 20200806
-       */
-    clearPageData: function() {
+     * 清空分页数据
+     * @author YangZhiJie 20200806
+     */
+    clearPageData: function () {
       var data = {
         dataList: [],
         totalSize: 0,
@@ -813,27 +999,45 @@ export default {
     },
 
     /**
-       * 清空界面的搜索条件
-       * @author YangZhiJie 20200806
-       * @author XiongLiuJie 20211119
-       */
-    clearFilter: function() {
+     * 清空界面的搜索条件
+     * @author YangZhiJie 20200806
+     * @author XiongLiuJie 20211119
+     */
+    clearFilter: function () {
       this.filter.orginalValue1 = null;
       this.filter.orginalValue2 = null;
       this.filter.assetDecrease = 0;
       // 上一次抽盘时间
       this.filter.lastRandomlyCheckDate1 = null;
       this.filter.lastRandomlyCheckDate2 = null;
+      this.filter.custodianId = null;
+      this.filter.depositoryUserId = null;
+      this.filter.selfNo = null;
+      (this.custodianNameFieldValue = {
+        id: null,
+        displayValue: [''],
+        fieldType: 'Key',
+      }),
+      (this.userFieldValue = {
+        id: null,
+        displayValue: [''],
+        fieldType: 'Key',
+      }),
+      (this.locationFieldValue = {
+        id: null,
+        displayValue: [''],
+        fieldType: 'Key',
+      }),
       this.initTreeData();
       this.getAssetInstance(false);
     },
 
     /**
-       * 初始化数据
-       * @author LeiGuoXian
-       * @date 2020-09-15
-       */
-    initTreeData: function() {
+     * 初始化数据
+     * @author LeiGuoXian
+     * @date 2020-09-15
+     */
+    initTreeData: function () {
       var _self = this;
       _self.$refs.projectItem.initProjectItem1();
       _self.$refs.organization.initClientOrganization1();
@@ -842,29 +1046,29 @@ export default {
     },
 
     /**
-       * 表格显示行数发生改变
-       * @author YangZhiJie 20200806
-       */
-    pageSizeChanged: function(newPageSize) {
+     * 表格显示行数发生改变
+     * @author YangZhiJie 20200806
+     */
+    pageSizeChanged: function (newPageSize) {
       this.pagination.per_page = newPageSize;
       this.pagination.current_page = 1;
       this.getAssetInstance(true);
     },
 
     /**
-       * 页数发生变化
-       * @author YangZhiJie 20200806
-       */
-    pageStartChanged: function() {
+     * 页数发生变化
+     * @author YangZhiJie 20200806
+     */
+    pageStartChanged: function () {
       this.getAssetInstance(true);
     },
 
     /**
-       * 冻结表头
-       */
-    fixedTableHeader: function() {
+     * 冻结表头
+     */
+    fixedTableHeader: function () {
       var _self = this;
-      _self.$nextTick(function() {
+      _self.$nextTick(function () {
         $('.fixed-table').tableFixer({
           head: true,
         });
@@ -876,9 +1080,9 @@ export default {
     },
 
     /**
-       * 打开资产卡片的CURD窗口
-       */
-    openCurdWindow: function(assetInstance) {
+     * 打开资产卡片的CURD窗口
+     */
+    openCurdWindow: function (assetInstance) {
       let url = Common.getRedirectUrl(
         '#/desktop/window/window-read/view/040701/0/' +
           assetInstance.id +
@@ -892,101 +1096,100 @@ export default {
 </script>
 
 <style scoped>
-  .grid-container {
-    margin-top: 10px;
-    display: grid;
-    grid-template-columns: 300px auto;
-    grid-template-rows: 35px 30px 1fr  40px;
-    gap: 10px;
-    justify-items: stretch;
-    align-items: stretch;
-    height: calc(100vh - 170px);
-    overflow: auto;
-  }
-
-  .grid-item-row1-column1 {
-    grid-row-start: 1;
-    grid-row-end: 2;
-    grid-column-start: 1;
-    grid-column-end: 3;
-  }
-
-  .grid-item-row1-column2 {
-    grid-row-start: 1;
-    grid-row-end: 2;
-    grid-column-start: 2;
-    grid-column-end: 3;
-  }
-
-  /* .grid-item-row2-column1 {
+.grid-container {
+  margin-top: 10px;
+  display: grid;
+  grid-template-columns: 300px auto;
+  grid-template-rows: 35px 30px 1fr 40px;
+  gap: 10px;
+  justify-items: stretch;
+  align-items: stretch;
+  height: calc(100vh - 170px);
+  overflow: auto;
+}
+
+.grid-item-row1-column1 {
+  grid-row-start: 1;
+  grid-row-end: 2;
+  grid-column-start: 1;
+  grid-column-end: 3;
+}
+
+.grid-item-row1-column2 {
+  grid-row-start: 1;
+  grid-row-end: 2;
+  grid-column-start: 2;
+  grid-column-end: 3;
+}
+
+/* .grid-item-row2-column1 {
     grid-row-start: 2;
     grid-row-end: 3;
     grid-column-start: 1;
     grid-column-end: 3;
   }
  */
-  .grid-item-row2-column2 {
-    grid-row-start: 2;
-    grid-row-end: 4;
-    grid-column-start: 2;
-    grid-column-end: 3;
-    overflow: auto;
-  }
-
-
-  .grid-item-row3-column1 {
-    grid-row-start: 2;
-    grid-row-end: 6;
-    grid-column-start: 1;
-    grid-column-end: 2;
-    overflow: auto;
-  }
-
-  .grid-item-row3-column2 {
-    grid-row-start: 4;
-    grid-row-end: 5;
-    grid-column-start: 2;
-    grid-column-end: 3;
-  }
-
-  .grid-item-row4-column2 {
-    grid-row-start: 5;
-    grid-row-end: 6;
-    grid-column-start: 2;
-    grid-column-end: 3;
-  }
-
-  .grid-item-row5-column2 {
-    grid-row-start: 6;
-    grid-row-end: 7;
-    grid-column-start: 2;
-    grid-column-end: 3;
-  }
+.grid-item-row2-column2 {
+  grid-row-start: 2;
+  grid-row-end: 4;
+  grid-column-start: 2;
+  grid-column-end: 3;
+  overflow: auto;
+}
+
+.grid-item-row3-column1 {
+  grid-row-start: 2;
+  grid-row-end: 6;
+  grid-column-start: 1;
+  grid-column-end: 2;
+  overflow: auto;
+}
+
+.grid-item-row3-column2 {
+  grid-row-start: 4;
+  grid-row-end: 5;
+  grid-column-start: 2;
+  grid-column-end: 3;
+}
+
+.grid-item-row4-column2 {
+  grid-row-start: 5;
+  grid-row-end: 6;
+  grid-column-start: 2;
+  grid-column-end: 3;
+}
+
+.grid-item-row5-column2 {
+  grid-row-start: 6;
+  grid-row-end: 7;
+  grid-column-start: 2;
+  grid-column-end: 3;
+}
 </style>
 
 <style scoped>
-  .m-grid-footer {
-    padding: 10px;
-  }
-
-  .m-panel {
-    margin-bottom: 0px;
-  }
-
-  .fixed-table {
-    table-layout: fixed;
-    width: 600px !important;
-    min-width: 600px !important;
-  }
-
-  table.fixed-table tr {
-    height: 40px;
-  }
-
-  table.fixed-table th,
-  table.fixed-table td {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
+.m-grid-footer {
+  padding: 10px;
+}
+
+.m-panel {
+  margin-bottom: 0px;
+}
+
+.fixed-table {
+  table-layout: fixed;
+  width: 600px !important;
+  min-width: 600px !important;
+}
+
+table.fixed-table tr {
+  height: 40px;
+}
+
+table.fixed-table th,
+table.fixed-table td {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 </style>

src/locales/en-US.json

@@ -502,6 +502,8 @@
       "unitOfMeasurement": "Unit Of Measurement",
       "usageStatus": "Usage Status",
       "user": "User",
+      "custodianName":"Custodian Name",
+      "depositoryUserName":"Depository UserName",
       "userInput": "User(Input)",
       "licensePlate": "License Plate",
       "selfNumbering": "Self Number",

src/locales/zh-CN.json

@@ -589,6 +589,8 @@
       "placementLocation": "放置房间",
       "unitOfMeasurement": "计量单位",
       "user": "使用人",
+      "custodianName":"责任人",
+      "depositoryUserName":"保管人",
       "usageStatus": "使用状况",
       "userInput": "使用人(输入)",
       "licensePlate": "车牌号码",