供应链系统--帐号管理对于新增仓库和减小仓库，有禁用或统一处理方式

src/views/setting/account.vue

@@ -67,6 +67,7 @@
         <div class="fr">
           <el-button size="mini" @click="handleDownload" v-if="checkBtnRole('download')">下载导入模板</el-button>
           <ExportButton class="import-btn" :exUrl="'admin/user/user/listExport'" :exParams="exParams" />
+          <ImportButton class="import-btn"  im-text="批量变更仓库和产品分类" :imUrl="'admin/user/batch/update'" @importSuccess="getList" />
 
           <el-upload
             class="import-btn"
@@ -81,8 +82,7 @@
               importLoading ? '导入中...' : '导入'
             }}</el-button>
           </el-upload>
-
-          <!--
+          <!--/admin/user/batch/update
           <el-button size="small" type="primary" @click="handleExport">导出</el-button>
 
           <el-button size="small" type="primary" :loading="importLoading" @click="clickImport">{{ importLoading ? '导入中...' : '导入' }}</el-button>

src/views/supply/implement/implement_list.vue

@@ -129,6 +129,15 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="是否置换过" prop="isDisplaceOrder">
+                    <el-select v-model="screenForm.isDisplaceOrder" clearable placeholder="请选择">
+                      <el-option label="是" :value="true"></el-option>
+                      <el-option label="否" :value="false"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="钱包" prop="walletIds1">
                     <el-select v-model="screenForm.walletIds1" size="mini" multiple filterable>
                       <el-option
@@ -525,7 +534,9 @@ export default {
         k3CategoryNumber: this.screenForm.k3CategoryNumber.join(','),
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
-        isOver: this.screenForm.isOver
+        isOver: this.screenForm.isOver,
+        isDisplaceOrder:this.screenForm.isDisplaceOrder
+
       }
     }
   },
@@ -566,7 +577,9 @@ export default {
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
         isOver: this.screenForm.isOver,
-        walletIds1: this.screenForm.walletIds1.join(',')
+        walletIds1: this.screenForm.walletIds1.join(','),
+        isDisplaceOrder:this.screenForm.isDisplaceOrder
+
       }
       getList(params).then(res => {
         res.data.records.forEach(item => {

src/views/supply/implement/implement_total_list.vue

@@ -135,6 +135,15 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="是否置换过" prop="isDisplaceOrder">
+                    <el-select v-model="screenForm.isDisplaceOrder" clearable placeholder="请选择">
+                      <el-option label="是" :value="true"></el-option>
+                      <el-option label="否" :value="false"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="钱包" prop="walletIds1">
                     <el-select v-model="screenForm.walletIds1" size="mini" multiple filterable>
                       <el-option
@@ -530,7 +539,8 @@ export default {
         policyRemark: '',
         isOver: '',
         orderDate: '',
-        walletIds1: []
+        walletIds1: [],
+        isDisplaceOrder:''
       },
       categoryList: [],
       statusList: [
@@ -567,7 +577,8 @@ export default {
         k3CategoryNumber: this.screenForm.k3CategoryNumber.join(','),
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
-        isOver: this.screenForm.isOver
+        isOver: this.screenForm.isOver,
+        isDisplaceOrder:this.screenForm.isDisplaceOrder
       }
     }
   },
@@ -608,7 +619,8 @@ export default {
         walletIds1: this.screenForm.walletIds1.join(','),
         policyCode: this.screenForm.policyCode,
         policyRemark: this.screenForm.policyRemark,
-        isOver: this.screenForm.isOver
+        isOver: this.screenForm.isOver,
+        isDisplaceOrder:this.screenForm.isDisplaceOrder
       }
       getTotalList(params).then(res => {
         res.data.records.forEach(item => {