Parcourir la source

3.0.36 修改资产转移查询窗口

liuyanpeng il y a 2 ans
Parent
commit
dd87285e7c

+ 1 - 1
package.json

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

+ 9 - 6
src/components/archive/AssetBatchOperationOrganization.vue

@@ -48,6 +48,7 @@
                   style="width: 115px"
                 >{{ $t('lang.AssetBatchOperationOrganization.useDepartmentAfterTransfer') }}</label>
                 <SearchWidget
+                  style="width: 236px;"
                   :info-window-no="infoWindowNo"
                   :field="responseOrganizationField"
                   :field-value="responseOrganizationFieldValue"
@@ -76,6 +77,7 @@
                   style="width: 115px"
                 >{{ $t('lang.AssetBatchOperationOrganization.newStorageLocation') }}</label>
                 <SearchWidget
+                  style="width: 236px;"
                   :info-window-no="locationInfoWindowNo"
                   :field="locationField"
                   :field-value="locationFieldValue"
@@ -90,6 +92,7 @@
                   style="width: 115px"
                 >{{ $t('lang.AssetBatchOperationOrganization.personHhandlingAParticularTask') }}</label>
                 <SearchWidget
+                  style="width: 236px;"
                   :info-window-no="userWindowNo"
                   :field="userField"
                   :field-value="userFieldValue"
@@ -193,12 +196,12 @@ export default {
         current_page: 1, // required
         last_page: 0, // required
       },
-      infoWindowNo: '20220420_233656',
+      infoWindowNo: '279750',
       whereClauseSource: {
         customerDataDimensions:[{
-          fieldName: 'id',
-          dataDimensionTypeNo: '202201191700',
-          defaultDataDimensionTypeValueNo: '2',
+          fieldName: 'client.id',
+          dataDimensionTypeNo: '202201191757',
+          defaultDataDimensionTypeValueNo: '3',
         }],
       },
       locationInfoWindowNo: 109494,
@@ -206,7 +209,7 @@ export default {
         customerDataDimensions:[{
           fieldName: 'client.id',
           dataDimensionTypeNo: '202201191757',
-          defaultDataDimensionTypeValueNo: '4',
+          defaultDataDimensionTypeValueNo: '3',
         }],
       },
 
@@ -214,7 +217,7 @@ export default {
         customerDataDimensions:[{
           fieldName: 'client.id',
           dataDimensionTypeNo: '202201191757',
-          defaultDataDimensionTypeValueNo: '4',
+          defaultDataDimensionTypeValueNo: '3',
         }],
       },
 

+ 12 - 12
src/components/customer/AssetDetailList.vue

@@ -107,7 +107,7 @@
           </div>
           <div v-show="type == 4" class="panel-body">
             <div>
-              <div>
+              <!-- <div>
                 <div class="form-group">
                   <label class="control-label">{{
                     $t("lang.AssetDetailList.usageStatus")
@@ -122,7 +122,7 @@
                     <option value="2" />
                   </select>
                 </div>
-              </div>
+              </div> -->
             </div>
             <div class="form-group">
               <label class="control-label">
@@ -144,7 +144,7 @@
                 class="form-control"
               />
             </div>
-
+            <!-- 
             <div class="form-group">
               <label class="control-label">
                 {{ $t("lang.AssetDetailList.startDate") }}</label>
@@ -153,16 +153,16 @@
                   v-model="filter.depreciationStartDate1"
                 />
               </div>
-            </div>
+            </div> -->
 
-            <div class="form-group">
+            <!-- <div class="form-group">
               <label class="control-label">~</label>
               <div class="input-group">
                 <Date
                   v-model="filter.depreciationStartDate2"
                 />
               </div>
-            </div>
+            </div> -->
 
             <div class="form-group">
               <label class="control-label">
@@ -185,7 +185,7 @@
               />
             </div>
 
-            <div class="form-group">
+            <!-- <div class="form-group">
               <label class="control-label">
                 {{ $t("lang.AssetDetailList.accumulatedDepreciation") }}</label>
               <input
@@ -204,8 +204,8 @@
                 type="number"
                 class="form-control"
               />
-            </div>
-            <div class="form-group">
+            </div> -->
+            <!-- <div class="form-group">
               <label class="control-label">
                 {{ $t("lang.AssetDetailList.serviceLife") }}</label>
               <input
@@ -223,7 +223,7 @@
                 type="number"
                 class="form-control"
               />
-            </div>
+            </div> -->
 
             <div class="form-group">
               <label class="control-label">{{
@@ -231,7 +231,7 @@
               }}</label>
               <input v-model="filter.selfNo" autocomplete="off" type="text" class="form-control" />
             </div>
-            <div class="form-group">
+            <!-- <div class="form-group">
               <label class="control-label">{{
                 $t("lang.AssetDetailList.vehicleNo")
               }}</label>
@@ -241,7 +241,7 @@
                 type="text"
                 class="form-control"
               />
-            </div>
+            </div> -->
 
             <div class="form-group">
               <label class="control-label">{{

+ 3 - 3
src/locales/zh-CN.json

@@ -341,7 +341,7 @@
       "originalValue": "原值",
       "accumulatedDepreciation": "累计折旧",
       "serviceLife": "使用年限(月)",
-      "selfNumbering": "自编号",
+      "selfNumbering": "号",
       "vehicleNo": "车牌号",
       "areThereAnyPictures": "是否有图片",
       "true": "是",
@@ -1057,7 +1057,7 @@
       "tagNumber": "标签编号",
       "balancingSegment": "公司代码",
       "description": "资产名称",
-
+      "aLocationToBePlacedIn":"放置位置",
       "assetName": "资产名称",
       "cardNumber": "卡片编号",
       "ownerDepartment": "所属单位部门",
@@ -1065,7 +1065,7 @@
       "type": "规格型号",
       "projectName": "项目名称",
       "originalValue": "原值",
-      "placeOfPlacement": "放置地点",
+      "placeOfPlacement": "原放置位置",
       "aRoomToBePlacedIn": "放置房间",
       "startDate": "开始使用日期",
       "user": "使用人",