完善

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

@@ -80,7 +80,7 @@
           >
             <a-select
               @select="middleChange"
-              v-decorator="['middleTypeId', {rules: [{required: true, message: '二级类别不能为空'}]}]"
+              v-decorator="['middleTypeId']"
               placeholder="请选择">
               <a-select-option
                 v-for="({id,name,no}) in spareTypeDataMiddle"

src/views/sqarepartmanage/sparepartinfo/modules/Detail.vue

@@ -9,7 +9,11 @@
     </a-row>
     <title-divider title="备件信息" width="90px"></title-divider>
     <detail-list title="" :col="3">
-      <detail-list-item term="备件图片"><img :src="BaseTool.Constant.FILE_URL + model.image" width="200px" height="200px"/></detail-list-item>
+      <detail-list-item term=""><img :src="BaseTool.Constant.FILE_URL + model.image" width="200px" height="200px"/></detail-list-item>
+      <detail-list-item term=""><img-code :src="model.qrCode" :type="2" :code-id="model.id" :width="200"></img-code></detail-list-item>
+    </detail-list>
+    <title-divider title="基础信息" width="90px"></title-divider>
+    <detail-list title="" :col="3">
       <detail-list-item term="id">{{ model.id }}</detail-list-item>
       <detail-list-item term="集团统一编码">{{ model.uniteNo }}</detail-list-item>
       <detail-list-item term="自编号">{{ model.zbh }}</detail-list-item>
@@ -37,8 +41,7 @@
       <detail-list-item term="创建人">{{ model.createdUserName }}</detail-list-item>
       <detail-list-item term="更新人">{{ model.updateUserName }}</detail-list-item>
       <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
-      <detail-list-item term="二维码"><img-code :src="model.qrCode" :type="2" :code-id="model.id" :width="200"></img-code></detail-list-item>
-    </detail-list>
+     </detail-list>
 
     <template slot="footer">
       <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>

src/views/store/sparestore/modules/BaseForm.vue

@@ -227,7 +227,7 @@ export default {
       }
     },
     handleStoreSelect () {
-      this.$refs.storeSelectModal.base({}, { filter: 0 })
+      this.$refs.storeSelectModal.base({}, {})
     },
     handleStoreSelected (record, keys, rows) {
       const [ key ] = keys

src/views/store/store/Store.vue

@@ -20,30 +20,6 @@
               <a-input v-model="queryParam.keyword" placeholder="请输入名称/编码"/>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="所属公司">
-              <a-select @change="handleCompanyChange" v-model="queryParam.useCompany" 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-col :md="6" :sm="24">
-            <a-form-item label="所属项目">
-              <a-select v-model="queryParam.useProject" 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 :md="6" :sm="24">
             <a-form-item label="选择等级">
               <a-select v-model="queryParam.level" placeholder="请选择">
@@ -83,7 +59,7 @@
       <a-button style="margin-left: 8px" v-if="$auth('store-stores-export')" type="primary" icon="download" @click="doExport">导出</a-button>
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('store-stores-del')">
         <a-menu slot="overlay">
-          <a-popconfirm title="是否要删除所选数据？" @confirm="batchDelete()">
+          <a-popconfirm title="删除仓库，将清空仓库所有物资数据？" @confirm="batchDelete()">
             <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
           </a-popconfirm>
         </a-menu>
@@ -109,7 +85,7 @@
           <a-divider v-if="$auth('store-stores-del')" type="vertical" />
           <a v-if="$auth('store-stores-edit')" @click="handleEdit(record)">修改</a>
           <a-divider v-if="$auth('store-stores-del')" type="vertical" />
-          <a-popconfirm v-if="$auth('store-stores-del')" title="是否要删除该条数据？" @confirm="batchDelete(record.id)">
+          <a-popconfirm v-if="$auth('store-stores-del')" title="删除仓库，将清空仓库所有物资数据？？" @confirm="batchDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
           <a-divider type="vertical" />