Ver Fonte

3.0.82 支持盘点的功能增加账套时间、计划开始时间、计划结束时间。

YangZhiJie há 1 ano atrás
pai
commit
acfbf03c29

+ 1 - 1
package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-eam-v3",
   "description": "Leanwo Prodog Client",
-  "version": "3.0.81",
+  "version": "3.0.82",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "ins": "npm install --registry=http://wuzhixin.vip:4873",

+ 0 - 37
src/api/base/UserResource.js

@@ -679,43 +679,6 @@ export default {
     });
   },
 
-  /**
-	 * 工具类自动生成的方法
-	 * 工具作者: 杨志杰
-	 * 查询当前物流人员输入的密码是否正确 
-	 */
-  queryPasswordByLogisticsPersonnel: function(password){
-    var requestUrl = 'userResource/queryPasswordByLogisticsPersonnel';
-    var paramCount = 0;
-    if(password != null){
-      requestUrl += (paramCount > 0) ? '&' : '?';
-      requestUrl += ('password=' + password);
-      paramCount ++;
-    }
-
-
-    return new Promise((resolve, reject) => {
-      $.ajax({
-        url: Common.getApiURL(requestUrl),
-        type: 'get',
-        contentType: 'application/json',
-				
-        dataType: 'json',
-				
-				
-        beforeSend: function(request) {
-          Common.addTokenToRequest(request);
-        },
-        success: function(data) {
-          resolve(data);
-        },
-        error: function(XMLHttpRequest, textStatus, errorThrown) {
-          reject(XMLHttpRequest);
-        },
-      });
-    });
-  },
-
   /**
 	 * 工具类自动生成的方法
 	 * 工具作者: 杨志杰

+ 1 - 1
src/components/customer/AssetInventoryStep3.vue

@@ -10,7 +10,7 @@
         </a-form-item>
 
         <a-form-item label="会计期间" :rules="[{ required: true }]" class="m-form-item">
-          <VueMonthlyPicker v-model="accountDate" date-format="YYYY-MM" class="m-monthly-picker" />
+          <Date v-model="accountDate" />
         </a-form-item>
 
         <a-form-item label="计划开始时间" :rules="[{ required: true }]" class="m-form-item">

+ 1 - 1
src/components/customer/AssetInventoryStep4.vue

@@ -10,7 +10,7 @@
         </a-form-item>
         
         <a-form-item label="会计期间" :rules="[{ required: true }]" class="m-form-item">
-          <VueMonthlyPicker v-model="accountDate" date-format="YYYY-MM" class="m-monthly-picker" />
+          <Date v-model="accountDate" />
         </a-form-item>
 
         <a-form-item label="计划开始时间" :rules="[{ required: true }]" class="m-form-item">

+ 1 - 1
src/components/customer/AssetInventoryStep5.vue

@@ -7,7 +7,7 @@
         </a-form-item>
         
         <a-form-item label="会计期间" :rules="[{ required: true }]" class="m-form-item">
-          <VueMonthlyPicker v-model="accountDate" date-format="YYYY-MM" class="m-monthly-picker" />
+          <Date v-model="accountDate" />
         </a-form-item>
 
         <a-form-item label="计划开始时间" :rules="[{ required: true }]" class="m-form-item">

+ 15 - 10
src/components/customer/AssetInventoryStep6.vue

@@ -140,16 +140,21 @@ export default {
       _self.loading = true;
       AssetInventoryResource.departmentGeneratesCountSheet(param).then(
         data => {
-          data.datas.forEach(function(item){
-            var organizationName = {
-              name: item.organizationName,
-              documentNo: item.documentNo,
-              documentName: item.name,
-              id: item.id,
-            };
-            _self.organizationNames.push(organizationName);
-          });
-          Notify.success('成功', '全公司生成盘点单成功', 2000);
+          if(data.errorCode != 0){
+            Notify.error('失败', data.errorMessage, false);
+          }else{
+            data.datas.forEach(function(item){
+              var organizationName = {
+                name: item.organizationName,
+                documentNo: item.documentNo,
+                documentName: item.name,
+                id: item.id,
+              };
+              _self.organizationNames.push(organizationName);
+            });
+            Notify.success('成功', '全公司生成盘点单成功', 2000);
+          }
+          
           _self.isShow = true;
           _self.loading = false;
         }, xmlHttpRequest => {

+ 14 - 10
src/components/customer/AssetInventoryStep7.vue

@@ -138,16 +138,20 @@ export default {
       _self.loading = true;
       AssetInventoryResource.departmentGeneratesCountSheet(param).then(
         data => {
-          data.datas.forEach(function(item){
-            var organizationName = {
-              name: item.organizationName,
-              documentNo: item.documentNo,
-              documentName: item.name,
-              id: item.id,
-            };
-            _self.organizationNames.push(organizationName);
-          });
-          Notify.success('成功', '部门生成盘点单成功', 2000);
+          if(data.errorCode != 0){
+            Notify.error('失败', data.errorMessage, false);
+          }else{
+            data.datas.forEach(function(item){
+              var organizationName = {
+                name: item.organizationName,
+                documentNo: item.documentNo,
+                documentName: item.name,
+                id: item.id,
+              };
+              _self.organizationNames.push(organizationName);
+            });
+            Notify.success('成功', '部门生成盘点单成功', 2000);
+          }
           _self.isShow = true;
           _self.loading = false;
         }, xmlHttpRequest => {