完善

src/views/account/settings/page/modules/AvatarModal.vue

@@ -82,12 +82,13 @@ export default {
         fileName: ''
       },
       previews: {
-        url: this.$store.getters.avatar
+        url: this.BaseTool.Constant.FILE_URL + this.$store.getters.avatar
       }
     }
   },
   methods: {
     edit (id) {
+      this.options.img = this.previews.url
       this.visible = true
       this.id = id
       /* 获取原始头像 */

src/views/check/checkjob/CheckJob.vue

@@ -16,7 +16,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="设备等级">
-                <a-select v-model="queryParam.sblevel" placeholder="请选择">
+                <a-select v-model="queryParam.sbLevel" placeholder="请选择">
                   <a-select-option
                     v-for="(label,value) in levelMap"
                     :key="value"

src/views/check/checkstandard/CheckStandard.vue

@@ -84,7 +84,7 @@
           v-if="($auth('check-spot-standards-add') || $auth('check-polling-standards-add'))"
           type="primary"
           icon="plus"
-          @click="$refs.baseModal.base()">新增
+          @click="$refs.baseModal.base(null,queryParam.sbId,queryParam.sbNo)">新增
         </a-button>
         <a-button style="margin-left:8px;" type="primary" @click="doImport">
           <a-icon type="upload"/>
@@ -216,7 +216,8 @@ export default {
       confirmLoading: false,
       queryParam: {
         type: this.$route.query.checkType || this.checkType,
-        sbId: this.$route.query.id
+        sbId: this.$route.query.id,
+        sbNo: this.$route.query.sbNo
       },
       // 表头
       columns: [

src/views/operate/article/modules/BaseForm.vue

@@ -37,7 +37,7 @@
         label="父文章"
         :labelCol="labelCol"
         :wrapperCol="wrapperCol"
-        v-show="type==3||type==4||type==5"
+        v-show="type==3||type==4||type==5||type==6"
       >
         <a-select v-decorator="['parentId']" >
           <a-select-option
@@ -269,6 +269,11 @@ export default {
     handleCancel (values) {
       this.visible = false
       this.confirmLoading = false
+      this.content = ''
+      this.resultContent = ''
+      this.topFlag = ''
+      this.status = 1
+      this.picture = ''
       this.form.resetFields()
       if (this.BaseTool.Object.isNotBlank(values)) {
         this.$emit('ok', values)

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

@@ -1,6 +1,6 @@
 <template>
   <div v-show="visible">
-    <div class="step">
+    <div class="step"></div>
       <a-steps :current="current" labelPlacement="vertical">
         <a-step title="基本信息" />
         <a-step title="自定义信息" />
@@ -32,7 +32,6 @@
                   label="设备价格"
                   :labelCol="BaseTool.Constant.labelCol"
                   :wrapperCol="BaseTool.Constant.wrapperCol"
-
                 >
                   <a-input-number
                     style="width: 100%"
@@ -281,6 +280,7 @@
                 </a-form-item>
               </a-col>
 
+              <<<<<<< HEAD
               <a-col :lg="12" :md="24" :sm="24">
                 <a-form-item
                   label="生产商"
@@ -424,208 +424,636 @@
             </a-row>
           </a-form>
         </div>
-      </div>
-    </div>
-    <div v-show="current == 1">
-      <div class="base">
-        <div class="title">
-          自定义参数
+        =======
+        >
+        <a-input-number
+          style="width: 100%"
+          :min="0"
+          :step="0.01"
+          :formatter="BaseTool.Amount.formatter"
+          :parser="BaseTool.Amount.parser"
+          v-decorator="['initialValue', {rules: [{required: true, message: '设备原值不能为空'}]}]" />
+        </a-form-item>
+        </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="设备类型"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-tree-select
+                style="width: 100%"
+                :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+                :treeData="sbTypeTreeData"
+                :treeNodeFilterProp="'title'"
+                :showSearch="true"
+                v-decorator="['typeId', {rules: [{required: true, message: '设备类型不能为空'}]}]"
+                placeholder="请选择"
+              >
+              </a-tree-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="自定义类型"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-select @change="handleChange" v-decorator="['useType', {rules: [{required: true, message: '自定义类型不能为空'}]}]" placeholder="请选择">
+                <a-select-option
+                  v-for="(label,value) in useTypeMap"
+                  :key="value"
+                  :label="label"
+                  :value="parseInt(value)">{{ label }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="状态"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-select v-decorator="['status', {rules: [{required: true, message: '状态不能为空'}]}]" placeholder="请选择">
+                <a-select-option
+                  v-for="(label,value) in statusMap"
+                  :key="value"
+                  :label="label"
+                  :value="parseInt(value)">{{ label }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="大小/尺寸"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-input
+                v-decorator="['zz']" />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="系列号(出厂编号)"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-input
+                v-decorator="['zzh']" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <!--        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="使用位置"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              v-decorator="['cph']" />
+          </a-form-item>
+        </a-col>-->
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="生产商"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-select
+                show-search
+                option-filter-prop="children"
+                :filter-option="filterOptionProducer"
+                v-decorator="['producerId']"
+                placeholder="请选择">
+                <a-select-option
+                  v-for="({id, name}) in producerList"
+                  :key="id"
+                  :label="name"
+                  :value="id">{{ name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+            <a-form-item
+              label="生产商"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+              v-show="false"
+            >
+              <a-input
+                v-decorator="['producerId', {rules: [{required: true, message: '生产商不能为空'}]}]" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="父设备"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-input
+                disabled
+                style="width: 60%"
+                v-decorator="['parentSbName']"/>
+              <a-button type="primary" style="width: 20%" @click="handleSbSelect">选择</a-button>
+              <a-button type="default" style="width: 20%" @click="clearParent">清空</a-button>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="是否子设备"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-select @change="childChange" v-decorator="['isChild', { rules: [{required: true, message: '是否子设备不能为空'}]}]" placeholder="请选择">
+                <a-select-option
+                  v-for="(label,value) in isChildMap"
+                  :key="value"
+                  :label="label"
+                  :value="parseInt(value)">{{ label }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="12" :md="24" :sm="24">
+            <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="['positionId', {rules: [{required: false, message: '上层位置不能为空'}]}]"
+                placeholder="请选择"
+              >
+              </a-tree-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="是否显示"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-select v-decorator="['isShow', { rules: [{required: true, message: '是否显示不能为空'}]}]" placeholder="请选择">
+                <a-select-option
+                  v-for="(label,value) in isShowMap"
+                  :key="value"
+                  :label="label"
+                  :value="parseInt(value)">{{ label }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <!--      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="水平位置"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input-number
+              :step="1"
+              :min="85"
+              style="width:70%"
+              v-decorator="['zjm']"
+              placeholder="请输入离屏幕左上角的右方距离，最低85"/>
+            <a-button style="width: 30%" type="primary" @click="handlePoint">设置预览</a-button>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="垂直位置"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input-number
+              :step="1"
+              :min="340"
+              style="width:70%"
+              v-decorator="['jbdh']"
+              placeholder="请输入离屏幕左上角的下方位置，最低340"/>
+            <a-button style="width: 30%" type="primary" @click="handlePoint">设置预览</a-button>
+          </a-form-item>
+        </a-col>
+      </a-row>-->
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="备注"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-input
+                v-decorator="['remark', {rules: [{required: false, message: '备注不能为空'}]}]" />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="使用机台"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-select v-decorator="['saveUser', {rules: [{required: true, message: '项目部不能为空'}]}]" placeholder="请选择">
+                <a-select-option
+                  v-for="({userId, realName}) in userList"
+                  :key="userId"
+                  :label="realName"
+                  :value="userId">{{ realName }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <!--      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="所属区域"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select @change="handleAreaChange" v-decorator="['useArea', {rules: [{required: true, message: '所属区域不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="({deptId, name}) in areaList"
+                :key="deptId"
+                :label="name"
+                :value="deptId">{{ name }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="所属公司"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select @change="handleCompanyChange" v-decorator="['useCompany', {rules: [{required: true, message: '所属公司不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="({deptId, name}) in companyList"
+                :key="deptId"
+                :label="name"
+                :value="deptId">{{ name }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="所属项目部"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select @change="handleProjectChange" v-decorator="['useProject', {rules: [{required: true, message: '项目部不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="({deptId, name}) in projectList"
+                :key="deptId"
+                :label="name"
+                :value="deptId">{{ name }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="所属部门"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select @change="handleDeptChange" v-decorator="['useDept', {rules: [{required: true, message: '所属公司不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="({deptId, name}) in deptList"
+                :key="deptId"
+                :label="name"
+                :value="deptId">{{ name }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>-->
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <!--        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="所属班组"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select @change="handleGroupChange" v-decorator="['useGroup', {rules: [{required: true, message: '项目部不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="({deptId, name}) in groupList"
+                :key="deptId"
+                :label="name"
+                :value="deptId">{{ name }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>-->
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="维修人"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-select v-decorator="['repairUser']" placeholder="请选择">
+                <a-select-option
+                  v-for="({userId, realName}) in userList"
+                  :key="userId"
+                  :label="realName"
+                  :value="userId">{{ realName }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="第二维修人员"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-select v-decorator="['repairUserSecond']" placeholder="请选择">
+                <a-select-option
+                  v-for="({userId, realName}) in userList"
+                  :key="userId"
+                  :label="realName"
+                  :value="userId">{{ realName }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="购置日期"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-date-picker
+                style="width: 100%"
+                :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
+                v-decorator="['buyDate', {rules: [{required: true, message: '不能为空'}]}]" />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="投用日期"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-date-picker
+                style="width: 100%"
+                :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
+                v-decorator="['startDate', {rules: [{required: true, message: '不能为空'}]}]" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="使用寿命"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-input
+                style="width: 100%"
+                suffix="年"
+                :formatter="BaseTool.Amount.formatter"
+                :parser="BaseTool.Amount.parser"
+                v-decorator="['workYear', {rules: [{required: true, message: '不能为空'}]}]" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <title-divider title="自定义参数" width="120px"></title-divider>
+        <div class="table-operator" style="margin-bottom: 8px;">
+          <a-button type="primary" @click="handleParam">
+            <a-icon type="plus"/>
+            添加
+          </a-button>
+          >>>>>>> ddcc4496ff5e990e79a3ff91b66284d7d8340f72
         </div>
-        <a-form :form="form">
-          <div class="main">
-            <div class="table-operator" style="margin-bottom: 8px;">
+      </div>
+      <div v-show="current == 1">
+        <div class="base">
+          <div class="title">
+            自定义参数
+          </div>
+          <a-form :form="form">
+            <div class="main">
+              <div class="table-operator" style="margin-bottom: 8px;">
             &nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp;<a-button type="primary" @click="handleParam">
               <a-icon type="plus"/>
               添加
             </a-button>
+              </div>
+              <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+                <a-col :key="index" v-for="(item, index) in paramList" :lg="12" :md="24" :sm="24">
+                  <a-form-item
+                    :label="item.name"
+                    :labelCol="BaseTool.Constant.labelCol"
+                    :wrapperCol="BaseTool.Constant.wrapperCol"
+                  >
+                    <a-input
+                      style="width: 70%"
+                      :defaultValue="item.content"
+                      disabled
+                    />
+                    <a-button style="width: 30%" type="primary" @click="handleDelParam(index)">删除</a-button>
+                  </a-form-item>
+                </a-col>
+              </a-row>
             </div>
-            <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
-              <a-col :key="index" v-for="(item, index) in paramList" :lg="12" :md="24" :sm="24">
-                <a-form-item
-                  :label="item.name"
-                  :labelCol="BaseTool.Constant.labelCol"
-                  :wrapperCol="BaseTool.Constant.wrapperCol"
-                >
-                  <a-input
-                    style="width: 70%"
-                    :defaultValue="item.content"
-                    disabled
-                  />
-                  <a-button style="width: 30%" type="primary" @click="handleDelParam(index)">删除</a-button>
-                </a-form-item>
-              </a-col>
-            </a-row>
-          </div>
-        </a-form>
+          </a-form>
+        </div>
       </div>
-    </div>
-    <div v-show="current == 2">
-      <a-form :form="form">
-        <div class="base">
-          <div class="title">
-            资产编号
-          </div>
-          <div class="main">
-            <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
-              <a-col :lg="12" :md="24" :sm="24">
-                <a-form-item
-                  label="资产编号1"
-                  :labelCol="BaseTool.Constant.labelCol"
-                  :wrapperCol="BaseTool.Constant.wrapperCol"
-                >
-                  <a-input
-                    v-decorator="['financingNo']" />
-                </a-form-item>
-              </a-col>
-              <a-col :lg="12" :md="24" :sm="24">
-                <a-form-item
-                  label="资产编号1"
-                  :labelCol="BaseTool.Constant.labelCol"
-                  :wrapperCol="BaseTool.Constant.wrapperCol"
-                >
-                  <a-input
-                    v-decorator="['financingNoTwo']" />
-                </a-form-item>
-              </a-col>
-            </a-row>
-            <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
-              <a-col :lg="12" :md="24" :sm="24">
-                <a-form-item
-                  label="资产编号3"
-                  :labelCol="BaseTool.Constant.labelCol"
-                  :wrapperCol="BaseTool.Constant.wrapperCol"
-                >
-                  <a-input
-                    v-decorator="['financingNoThird']" />
-                </a-form-item>
-              </a-col>
-              <a-col :lg="12" :md="24" :sm="24">
-                <a-form-item
-                  label="资产编号4"
-                  :labelCol="BaseTool.Constant.labelCol"
-                  :wrapperCol="BaseTool.Constant.wrapperCol"
-                >
-                  <a-input
-                    v-decorator="['financingNoFour']" />
-                </a-form-item>
-              </a-col>
-            </a-row>
-            <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
-              <a-col :lg="12" :md="24" :sm="24">
-                <a-form-item
-                  label="资产编号5"
-                  :labelCol="BaseTool.Constant.labelCol"
-                  :wrapperCol="BaseTool.Constant.wrapperCol"
-                >
-                  <a-input
-                    v-decorator="['financingNoFive']" />
-                </a-form-item>
-              </a-col>
-            </a-row>
+      <div v-show="current == 2">
+        <a-form :form="form">
+          <div class="base">
+            <div class="title">
+              资产编号
+            </div>
+            <div class="main">
+              <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+                <a-col :lg="12" :md="24" :sm="24">
+                  <a-form-item
+                    label="资产编号1"
+                    :labelCol="BaseTool.Constant.labelCol"
+                    :wrapperCol="BaseTool.Constant.wrapperCol"
+                  >
+                    <a-input
+                      v-decorator="['financingNo']" />
+                  </a-form-item>
+                </a-col>
+                <a-col :lg="12" :md="24" :sm="24">
+                  <a-form-item
+                    label="资产编号1"
+                    :labelCol="BaseTool.Constant.labelCol"
+                    :wrapperCol="BaseTool.Constant.wrapperCol"
+                  >
+                    <a-input
+                      v-decorator="['financingNoTwo']" />
+                  </a-form-item>
+                </a-col>
+              </a-row>
+              <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+                <a-col :lg="12" :md="24" :sm="24">
+                  <a-form-item
+                    label="资产编号3"
+                    :labelCol="BaseTool.Constant.labelCol"
+                    :wrapperCol="BaseTool.Constant.wrapperCol"
+                  >
+                    <a-input
+                      v-decorator="['financingNoThird']" />
+                  </a-form-item>
+                </a-col>
+                <a-col :lg="12" :md="24" :sm="24">
+                  <a-form-item
+                    label="资产编号4"
+                    :labelCol="BaseTool.Constant.labelCol"
+                    :wrapperCol="BaseTool.Constant.wrapperCol"
+                  >
+                    <a-input
+                      v-decorator="['financingNoFour']" />
+                  </a-form-item>
+                </a-col>
+              </a-row>
+              <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+                <a-col :lg="12" :md="24" :sm="24">
+                  <a-form-item
+                    label="资产编号5"
+                    :labelCol="BaseTool.Constant.labelCol"
+                    :wrapperCol="BaseTool.Constant.wrapperCol"
+                  >
+                    <a-input
+                      v-decorator="['financingNoFive']" />
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </div>
           </div>
-        </div>
-        <div class="base">
-          <div class="title">文件信息</div>
-          <div class="main">
-            <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
-              <a-col :lg="12" :md="24" :sm="24">
-                <a-form-item
-                  label="维保手册"
-                  :labelCol="BaseTool.Constant.labelCol"
-                  :wrapperCol="BaseTool.Constant.wrapperCol"
-                >
-                  <a-upload
-                    :action="uploadUrl"
-                    :multiple="true"
-                    :file-list="this.defaultRepairFileList"
-                    @change="handleRepairFileChange"
-                    :headers="headers"
+          <div class="base">
+            <div class="title">文件信息</div>
+            <div class="main">
+              <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+                <a-col :lg="12" :md="24" :sm="24">
+                  <a-form-item
+                    label="维保手册"
+                    :labelCol="BaseTool.Constant.labelCol"
+                    :wrapperCol="BaseTool.Constant.wrapperCol"
                   >
-                    <a-button> <a-icon type="upload" /> 选择上传文件 </a-button>
-                  </a-upload>
-                </a-form-item>
-              </a-col>
-              <a-col :lg="12" :md="24" :sm="24">
-                <a-form-item
-                  label="使用手册"
-                  :labelCol="BaseTool.Constant.labelCol"
-                  :wrapperCol="BaseTool.Constant.wrapperCol"
-                >
-                  <a-upload
-                    :action="uploadUrl"
-                    :multiple="true"
-                    :file-list="this.defaultUseFileList"
-                    @change="handleUseFileChange"
-                    :headers="headers"
+                    <a-upload
+                      :action="uploadUrl"
+                      :multiple="true"
+                      :file-list="this.defaultRepairFileList"
+                      @change="handleRepairFileChange"
+                      :headers="headers"
+                    >
+                      <a-button> <a-icon type="upload" /> 选择上传文件 </a-button>
+                    </a-upload>
+                  </a-form-item>
+                </a-col>
+                <a-col :lg="12" :md="24" :sm="24">
+                  <a-form-item
+                    label="使用手册"
+                    :labelCol="BaseTool.Constant.labelCol"
+                    :wrapperCol="BaseTool.Constant.wrapperCol"
                   >
-                    <a-button> <a-icon type="upload" /> 选择上传文件 </a-button>
-                  </a-upload>
-                </a-form-item>
-              </a-col>
-            </a-row>
-            <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
-              <a-col :lg="12" :md="24" :sm="24">
-                <a-form-item
-                  label="验收文件"
-                  :labelCol="BaseTool.Constant.labelCol"
-                  :wrapperCol="BaseTool.Constant.wrapperCol"
-                >
-                  <a-upload
-                    :action="uploadUrl"
-                    :multiple="true"
-                    :file-list="this.defaultRecheckFileList"
-                    @change="handleRecheckFileChange"
-                    :headers="headers"
+                    <a-upload
+                      :action="uploadUrl"
+                      :multiple="true"
+                      :file-list="this.defaultUseFileList"
+                      @change="handleUseFileChange"
+                      :headers="headers"
+                    >
+                      <a-button> <a-icon type="upload" /> 选择上传文件 </a-button>
+                    </a-upload>
+                  </a-form-item>
+                </a-col>
+              </a-row>
+              <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+                <a-col :lg="12" :md="24" :sm="24">
+                  <a-form-item
+                    label="验收文件"
+                    :labelCol="BaseTool.Constant.labelCol"
+                    :wrapperCol="BaseTool.Constant.wrapperCol"
                   >
-                    <a-button> <a-icon type="upload" /> 选择上传文件 </a-button>
-                  </a-upload>
-                </a-form-item>
-              </a-col>
-              <a-col :lg="12" :md="24" :sm="24">
-                <a-form-item
-                  label="设备图片"
-                  :labelCol="BaseTool.Constant.labelCol"
-                  :wrapperCol="BaseTool.Constant.wrapperCol"
-                >
-                  <a-upload
-                    :action="uploadUrl"
-                    :multiple="false"
-                    list-type="picture"
-                    :file-list="this.defaultSbFileList"
-                    @change="handleSbFileChange"
-                    accept="image/*"
-                    :headers="headers"
+                    <a-upload
+                      :action="uploadUrl"
+                      :multiple="true"
+                      :file-list="this.defaultRecheckFileList"
+                      @change="handleRecheckFileChange"
+                      :headers="headers"
+                    >
+                      <a-button> <a-icon type="upload" /> 选择上传文件 </a-button>
+                    </a-upload>
+                  </a-form-item>
+                </a-col>
+                <a-col :lg="12" :md="24" :sm="24">
+                  <a-form-item
+                    label="设备图片"
+                    :labelCol="BaseTool.Constant.labelCol"
+                    :wrapperCol="BaseTool.Constant.wrapperCol"
                   >
-                    <a-button> <a-icon type="upload" /> 选择上传文件 </a-button>
-                  </a-upload>
-                </a-form-item>
-              </a-col>
-            </a-row>
+                    <a-upload
+                      :action="uploadUrl"
+                      :multiple="false"
+                      list-type="picture"
+                      :file-list="this.defaultSbFileList"
+                      @change="handleSbFileChange"
+                      accept="image/*"
+                      :headers="headers"
+                    >
+                      <a-button> <a-icon type="upload" /> 选择上传文件 </a-button>
+                    </a-upload>
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </div>
           </div>
-        </div>
-      </a-form>
-    </div>
-    <div class="btn">
-      <a-button style="margin:0 20px;" type="primary" @click="handleCancel()">
-        返回
-      </a-button>
+        </a-form>
+      </div>
+      <div class="btn">
+        <a-button style="margin:0 20px;" type="primary" @click="handleCancel()">
+          返回
+        </a-button>
 
-      <a-button style="margin:0 20px;" v-show="current!=0" type="primary" @click="current-=1">
-        上一页
-      </a-button>
-      <a-button style="margin:0 20px;" v-show="current!=2" type="primary" @click="current+=1">
-        下一页
-      </a-button>
-      <a-button style="margin:0 20px;" v-show="current==2" type="primary" @click="save()">
-        提交
-      </a-button>
+        <a-button style="margin:0 20px;" v-show="current!=0" type="primary" @click="current-=1">
+          上一页
+        </a-button>
+        <a-button style="margin:0 20px;" v-show="current!=2" type="primary" @click="current+=1">
+          下一页
+        </a-button>
+        <a-button style="margin:0 20px;" v-show="current==2" type="primary" @click="save()">
+          提交
+        </a-button>
+      </div>
+      <sb-model-select-modal ref="sbModelSelectModal" @selected="handleSbModelSelected"/>
+      <sb-info-select-modal ref="sbInfoSelectModal" @selected="handleSbSelectd"/>
+      <firm-producer-select-modal ref="producerSelectModal" @selected="handleProducerSelected"/>
+      <param-form ref="paramForm" @ok="handleParamList" />
     </div>
-    <sb-model-select-modal ref="sbModelSelectModal" @selected="handleSbModelSelected"/>
-    <sb-info-select-modal ref="sbInfoSelectModal" @selected="handleSbSelectd"/>
-    <firm-producer-select-modal ref="producerSelectModal" @selected="handleProducerSelected"/>
-    <param-form ref="paramForm" @ok="handleParamList" />
-  </div>
-</template>
+  </div></template>
 
 <script>
 import pick from 'lodash.pick'

src/views/sb/info/modules/Detail.vue

@@ -485,17 +485,17 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     handleViewCheck (type) {
-      const routeUrl = this.$router.resolve({ path: '/check/polling-standard', query: { id: this.model.id, checkType: type } })
+      const routeUrl = this.$router.resolve({ path: '/check/polling-standard', query: { id: this.model.id, checkType: type, sbNo: this.model.no } })
       // let routeUrl = this.$router.resolve(`/share/${96}`)
       window.open(routeUrl.href, '_blank')
     },
     handleViewCheck2 (type) {
-      const routeUrl = this.$router.resolve({ path: '/check/spot-standard', query: { id: this.model.id, checkType: type } })
+      const routeUrl = this.$router.resolve({ path: '/check/spot-standard', query: { id: this.model.id, checkType: type, sbNo: this.model.no } })
       // let routeUrl = this.$router.resolve(`/share/${96}`)
       window.open(routeUrl.href, '_blank')
     },
     handleViewCheck3 (type) {
-      const routeUrl = this.$router.resolve({ path: '/check-run-standard', query: { id: this.model.id, checkType: type } })
+      const routeUrl = this.$router.resolve({ path: '/check-run-standard', query: { id: this.model.id, checkType: type, sbNo: this.model.no } })
       // let routeUrl = this.$router.resolve(`/share/${96}`)
       window.open(routeUrl.href, '_blank')
     },

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

@@ -101,15 +101,7 @@ export default {
         },
         {
           title: '存放位置',
-          dataIndex: 'positionId'
-        },
-        {
-          title: '使用班组',
-          dataIndex: 'useGroupName'
-        },
-        {
-          title: '管理人员',
-          dataIndex: 'saveUserName'
+          dataIndex: 'storeName'
         },
         {
           title: '设备编号',

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="handleExcute(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>
@@ -96,7 +96,6 @@ import { STable, Ellipsis } from '@/components'
 import BaseForm from './modules/BaseForm'
 import Detail from './modules/Detail'
 import { getCheckPlanPage, excuteCheckPlan, deleteCheckPlans, fetchCheckPlan, exportCheckPlan } from '@/api/sb/sbstorecheckplan'
-import { fetchStoreTree } from '@/api/store/store'
 import StoreCheckJobTable2 from '@/views/sb/storecheckjob/modules/StoreCheckJobTable2'
 import { queryDept } from '@/api/upms/dept'
 
@@ -140,7 +139,7 @@ export default {
           dataIndex: 'name'
         },
         {
-          title: '项目部',
+          title: '区域',
           dataIndex: 'storeName'
         },
         {
@@ -269,14 +268,12 @@ export default {
       })
     },
     handleEdit (record) {
-      fetchCheckPlan({ id: record.id }).then(res => {
-        const modal = this.$refs.baseModal
-        modal.base(res.data)
-      })
+      const modal = this.$refs.baseModal
+      modal.base(record)
     },
-    handleExcute (record) {
+    handleExecute (record) {
       excuteCheckPlan({ id: record.id }).then(res => {
-        this.$message.info('启动中，请稍后查看任务')
+        this.$message.info('任务启动中，请稍后查看任务')
         this.$refs.table.refresh(true)
       })
     },

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

@@ -37,16 +37,34 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="项目部"
+            label="设备类型"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select @change="handleProjectChange" v-decorator="['storeId', {rules: [{required: true, message: '项目不能为空'}]}]" placeholder="请选择">
+            <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-select   v-decorator="['storeId', {rules: [{required: false, message: '盘点区域不能为空'}]}]" placeholder="请选择">
               <a-select-option
-                v-for="({deptId, name}) in projectList"
-                :key="deptId"
+                v-for="({id,name}) in sbPositionData"
+                :key="id"
                 :label="name"
-                :value="deptId">{{ name }}
+                :value="id">{{ name }}
               </a-select-option>
             </a-select>
           </a-form-item>
@@ -133,8 +151,9 @@
 <script>
 import pick from 'lodash.pick'
 import { addCheckPlan, updateCheckPlan } from '@/api/sb/sbstorecheckplan'
-import { queryDept } from '@/api/upms/dept'
-import { queryUsersByParentDeptNatureAll } from '@/api/upms/user'
+import { queryUser } from '@/api/upms/user'
+import { fetchSbTypeTree } from '@/api/sb/type'
+import { querySbPosition } from '@/api/sb/position'
 
 export default {
   name: 'BaseCheckPlan',
@@ -157,10 +176,11 @@ export default {
       visible: false,
       // 下拉框map
       typeMap: {},
+      treeData: [],
+      sbPositionData: [],
       periodTypeMap: {},
       checkUserTypeMap: {},
       validTimeTypeMap: {},
-      projectList: {},
       userList: {},
       enableMap: {},
       rowSelection: {
@@ -193,8 +213,11 @@ export default {
     this.periodTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_PERIOD_TYPE)
     this.validTimeTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_PERIOD_TYPE)
     this.enableMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
-    queryDept({ nature: this.DictCache.VALUE.SYS_DEPT_NATURE.XIANG_MU_BU }).then(res => {
-      this.projectList = res.data
+    fetchSbTypeTree().then(res => {
+      this.treeData = res.data
+    })
+    querySbPosition().then(res => {
+      this.sbPositionData = res.data
     })
   },
   methods: {
@@ -206,10 +229,8 @@ export default {
         return
       }
       this.modalTitle = '编辑'
-      const params = { includeMy: true }
-      params.deptId = record.storeId
-      params.nature = this.DictCache.VALUE.SYS_DEPT_NATURE.XIANG_MU_BU
-      queryUsersByParentDeptNatureAll(params).then(res => {
+      const params = { }
+      queryUser(params).then(res => {
         this.userList = res.data
       })
       const { form: { setFieldsValue } } = this
@@ -267,19 +288,6 @@ export default {
         this.$emit('ok', values)
       }
     },
-    handleProjectChange (value) {
-      const params = { includeMy: true }
-      if (this.BaseTool.Object.isBlank(value)) {
-        this.$message.info('请先选择项目部')
-        return
-      } else {
-        params.deptId = value
-      }
-      params.nature = this.DictCache.VALUE.SYS_DEPT_NATURE.XIANG_MU_BU
-      queryUsersByParentDeptNatureAll(params).then(res => {
-        this.userList = res.data
-      })
-    }
 
   }
 }

src/views/sqarepartmanage/sparetype/modules/BaseForm.vue

@@ -56,7 +56,7 @@
           </a-select-option>
         </a-select>
       </a-form-item>
-      <a-form-item
+      <!--      <a-form-item
         label="设备类型"
         :labelCol="BaseTool.Constant.labelCol"
         :wrapperCol="BaseTool.Constant.wrapperCol"
@@ -72,8 +72,8 @@
           placeholder="请选择"
         >
         </a-tree-select>
-      </a-form-item>
-<!--      <a-form-item
+      </a-form-item>-->
+      <!--      <a-form-item
         label="所属型号"
         :labelCol="BaseTool.Constant.labelCol"
         :wrapperCol="BaseTool.Constant.wrapperCol"
@@ -144,12 +144,12 @@ export default {
     this.delFlagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.DELFLAG)
   },
   methods: {
-    modelTypeChange (value) {
+    /* modelTypeChange (value) {
       console.log(value)
       querySbInfo({ typeId: value }).then(res => {
         this.modelList = res.data
       })
-    },
+    }, */
     base (record) {
       this.setTree(record)
       this.visible = true
@@ -222,11 +222,11 @@ export default {
       fetchSbTypeTree().then(res => {
         this.sbTypeTreeData = res.data
       })
-      if (record.modelType != null) {
+      /* if (record.modelType != null) {
         querySbInfo({ typeId: record.modelType }).then(res => {
           this.modelList = res.data.rows
         })
-      }
+      } */
     }
 
   }