盘点

README.md

@@ -1,2 +1,2 @@
-# 乾元坤和-antd
+# 时代思康-antd
 

public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>logo.png">
-    <title>乾元坤和</title>
+    <title>时代思康</title>
     <style>#loading-mask{position:fixed;left:0;top:0;height:100%;width:100%;background:#fff;user-select:none;z-index:9999;overflow:hidden}.loading-wrapper{position:absolute;top:50%;left:50%;transform:translate(-50%,-100%)}.loading-dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:64px;width:64px;height:64px;box-sizing:border-box}.loading-dot i{width:22px;height:22px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.loading-dot i:nth-child(1){top:0;left:0}.loading-dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.loading-dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.loading-dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style>
     <!-- require cdn assets css -->
     <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>

public/tui-calendar/checkJobCalendar.html

@@ -41,7 +41,7 @@
             </div>
         </div>
         <div class="lnb-footer">
-            © 乾元坤和.
+            © 时代思康.
         </div>
     </div>
     <div id="right">

public/tui-calendar/checkJobCalendar2.html

@@ -35,7 +35,7 @@
             </div>
         </div>
         <div class="lnb-footer">
-            © 乾元坤和.
+            © 时代思康.
         </div>
     </div>
     <div id="right">

public/tui-calendar/example00-basic.html

@@ -35,7 +35,7 @@
             </div>
         </div>
         <div class="lnb-footer">
-            © 乾元坤和.
+            © 时代思康.
         </div>
     </div>
     <div id="right">

src/i18n/en.js

@@ -2,7 +2,7 @@ export const m = {
   // common
   common: {
     language: 'change language',
-    welcome: '乾元坤和',
+    welcome: '时代思康',
     login: 'Sign In',
     remember: 'Remember password',
     system_name: 'Equipment management system',

src/utils/domUtil.js

@@ -16,4 +16,4 @@ export const setDocumentTitle = function (title) {
   }
 }
 
-export const domTitle = '乾元坤和'
+export const domTitle = '时代思康'

src/views/sb/storecheckjob/StoreCheckJob.vue

@@ -135,6 +135,10 @@ export default {
           title: '盘点区域',
           dataIndex: 'storeName'
         },
+        {
+          title: '设备编号',
+          dataIndex: 'sbNo'
+        },
         {
           title: '设备名称',
           dataIndex: 'spareName'

src/views/sb/storecheckjob/modules/StoreCheckJobTable2.vue

@@ -13,7 +13,7 @@
       <detail-list-item term="编码">{{ model.no }}</detail-list-item>
       <detail-list-item term="计划名称">{{ model.name }}</detail-list-item>
       <detail-list-item term="项目部">{{ model.storeName }}</detail-list-item>
-      <detail-list-item term="盘点人">{{ model.checkUserName }}</detail-list-item>
+      <detail-list-item term="负责人">{{ model.checkUserName }}</detail-list-item>
       <detail-list-item term="计划开始时间">{{ model.startTime }}</detail-list-item>
       <detail-list-item term="计划结束时间">{{ model.endTime }}</detail-list-item>
       <detail-list-item term="是否启用"><badge :status="DictCache.COLOR.YES_NO[model.enable]" :text="enableMap[model.enable]"></badge></detail-list-item>

src/views/sb/storecheckplan/StoreCheckPlan.vue

@@ -66,7 +66,7 @@
             <a-divider type="vertical" />
             <a v-if="($auth('check-spot-plans-edit') || $auth('check-polling-plans-edit'))" @click="handleEdit(record)">修改</a>
             <a-divider type="vertical" v-if="record.status == 1"/>
-            <a v-if="record.status == 1" @click="handleExecute(record)">执行</a>
+            <a v-if="record.status == 1" @click="handleExecute(record)">启动</a>
             <a-divider type="vertical" />
             <a-popconfirm v-if="($auth('check-spot-plans-del') || $auth('check-polling-plans-del'))" title="是否要删除该条数据？" @confirm="batchDelete(record.id)">
               <a>删除</a>
@@ -143,7 +143,7 @@ export default {
           dataIndex: 'storeName'
         },
         {
-          title: '盘点人',
+          title: '负责人',
           dataIndex: 'checkUserName'
         },
         {

src/views/sb/storecheckplan/modules/BaseForm.vue

@@ -37,45 +37,11 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="设备类型"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-tree-select
-              style="width: 100%"
-              :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
-              :treeData="treeData"
-              :treeNodeFilterProp="'title'"
-              :showSearch="true"
-              v-decorator="['spareType', {rules: [{required: false, message: '设备类型不能为空'}]}]"
-              placeholder="请选择"
-            >
-            </a-tree-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="盘点区域"
+            label="负责人"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select   v-decorator="['storeId', {rules: [{required: false, message: '盘点区域不能为空'}]}]" placeholder="请选择">
-              <a-select-option
-                v-for="({id,name}) in sbPositionData"
-                :key="id"
-                :label="name"
-                :value="id">{{ name }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="盘点人"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['checkUserId', {rules: [{required: true, message: '盘点人不能为空'}]}]" placeholder="请选择">
+            <a-select v-decorator="['checkUserId', {rules: [{required: true, message: '负责人不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="({userId, realName}) in userList"
                 :key="userId"
@@ -109,6 +75,42 @@
               v-decorator="['endTime', {rules: [{required: true, message: '计划结束时间不能为空'}]}]"/>
           </a-form-item>
         </row-item>
+        <row-item>
+          <a-form-item
+            label="设备类型"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-tree-select
+              style="width: 100%"
+              :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+              :treeData="treeData"
+              :treeNodeFilterProp="'title'"
+              :showSearch="true"
+              v-decorator="['spareType', {rules: [{required: false, message: '设备类型不能为空'}]}]"
+              placeholder="请选择"
+            >
+            </a-tree-select>
+          </a-form-item>
+        </row-item>
+        <row-item>
+          <a-form-item
+            label="盘点区域"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-tree-select
+              style="width: 100%"
+              :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+              :treeData="sbPositionData"
+              :treeNodeFilterProp="'title'"
+              :showSearch="true"
+              v-decorator="['storeId', {rules: [{required: false, message: '不能为空'}]}]"
+              placeholder="请选择"
+            >
+            </a-tree-select>
+          </a-form-item>
+        </row-item>
         <row-item>
           <a-form-item
             label="是否启用"
@@ -153,7 +155,7 @@ import pick from 'lodash.pick'
 import { addCheckPlan, updateCheckPlan } from '@/api/sb/sbstorecheckplan'
 import { queryUser } from '@/api/upms/user'
 import { fetchSbTypeTree } from '@/api/sb/type'
-import { querySbPosition } from '@/api/sb/position'
+import { getSbPositionTree } from '@/api/sb/position'
 
 export default {
   name: 'BaseCheckPlan',
@@ -216,9 +218,13 @@ export default {
     fetchSbTypeTree().then(res => {
       this.treeData = res.data
     })
-    querySbPosition().then(res => {
+    getSbPositionTree().then(res => {
       this.sbPositionData = res.data
     })
+    const params = { }
+    queryUser(params).then(res => {
+      this.userList = res.data
+    })
   },
   methods: {
     base (record) {
@@ -229,10 +235,6 @@ export default {
         return
       }
       this.modalTitle = '编辑'
-      const params = { }
-      queryUser(params).then(res => {
-        this.userList = res.data
-      })
       const { form: { setFieldsValue } } = this
       // 日期处理
       record.startTime = this.BaseTool.Moment(record.startTime, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
@@ -287,7 +289,7 @@ export default {
       if (this.BaseTool.Object.isNotBlank(values)) {
         this.$emit('ok', values)
       }
-    },
+    }
 
   }
 }