修改

src/views/warehouseManagement/stocktaking/plan/components/plan-search.vue

@@ -46,33 +46,66 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划单号:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model="where.planCode" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model="where.planName" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="状态:">
+          <el-select
+            filterable
+            class="w100"
+            size="small"
+            v-model="where.status"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in statusList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="组织机构:" prop="deptIds">
           <auth-selection
             v-model="where.deptIds"
             style="width: 100%"
           ></auth-selection>
         </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      </el-col> -->
+      <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="盘点部门:">
-          <el-input clearable v-model="where.dep" placeholder="请输入" />
+          <DeptSelect v-model="where.executeGroupId" @input="nodeClick" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="盘点人员:">
-          <el-input clearable v-model="where.texture" placeholder="请输入" />
+          <el-select
+            filterable
+            class="w100"
+            size="small"
+            v-model="where.executorId"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in userList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      </el-col> -->
+      <el-col v-bind="styleResponsive ? { lg: 18, md: 12 } : { span: 18 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"
@@ -97,25 +130,38 @@
 </template>
 
 <script>
+  import DeptSelect from '@/components/CommomSelect/new-dept-select.vue';
   import storageApi from '@/api/warehouseManagement/index.js';
   import warehouseDefinition from '@/api/warehouseManagement/warehouseDefinition';
   export default {
+    components: { DeptSelect },
     data() {
       // 默认表单数据
       const defaultWhere = {
         name: '',
         factoryId: '',
         warehouseId: '',
+        executorId: '',
         code: '',
-        fixCode: '',
-        ownershipGroupId: ''
+        executeGroupId: '',
+        status: '',
+        planCode: '',
+        executeGroupName: '',
+        executorName: ''
       };
       return {
         // 表单数据
+        defaultWhere: { ...defaultWhere },
         warehouseList: [],
         factoryList: [],
         where: { ...defaultWhere },
-        treeData: []
+        treeData: [],
+        statusList: [
+          { label: '未派单', value: 0 },
+          { label: '已派单', value: 1 },
+          { label: '已完成', value: 2 },
+          { label: '已撤回', value: 3 }
+        ]
       };
     },
     computed: {
@@ -128,6 +174,22 @@
       this.getFactoryList();
     },
     methods: {
+      async nodeClick(id, data) {
+        this.where.executeGroupId = id;
+        if (data) {
+          this.where.executeGroupName = data.name;
+        }
+        this.where.executorName = '';
+        this.where.executorId = '';
+        if (id) {
+          let userData = await warehouseDefinition.getUserPage({
+            groupId: id,
+            size: 9999,
+            pageNum: 1
+          });
+          this.userList = userData.list;
+        }
+      },
       async getTreeData(val) {
         this.where.targetWarehouse = '';
         this.where.sourceWarehouse = '';

src/views/warehouseManagement/stocktaking/plan/index.vue

@@ -234,15 +234,11 @@
           type: 'warning'
         })
           .then(() => {
-            revocationInventoryPlan({ id: row.id })
-              .then((data) => {
-                console.log(data);
-                this.$message.success('撤回成功!');
-                this.reload();
-              })
-              .catch((e) => {
-                this.$message.error(e.message);
-              });
+            revocationInventoryPlan({ id: row.id }).then((data) => {
+              console.log(data);
+              this.$message.success('撤回成功!');
+              this.reload();
+            });
           })
           .catch(() => {});
       }

src/views/warehouseManagement/stocktaking/reportLoss/components/reportloss-search.vue

@@ -45,28 +45,55 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="单号:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+        <el-form-item label="关键词:">
+          <el-input
+            clearable
+            v-model="where.keyWords"
+            placeholder="请输入单号/名称"
+          />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="报损报溢部门:">
-          <el-input clearable v-model="where.dep" placeholder="请输入" />
+          <DeptSelect v-model="where.executeGroupId" @input="nodeClick" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="报损报溢人员:">
-          <el-input clearable v-model="where.texture" placeholder="请输入" />
+          <el-select
+            filterable
+            class="w100"
+            size="small"
+            v-model="where.executorId"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in userList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="状态:">
-          <el-input clearable v-model="where.dep" placeholder="请输入" />
+          <el-select
+            filterable
+            class="w100"
+            size="small"
+            v-model="where.status"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in statusOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
@@ -94,22 +121,42 @@
 </template>
 
 <script>
+  import DeptSelect from '@/components/CommomSelect/new-dept-select.vue';
   import storageApi from '@/api/warehouseManagement/index.js';
   import warehouseDefinition from '@/api/warehouseManagement/warehouseDefinition';
   export default {
+    components: { DeptSelect },
     data() {
       // 默认表单数据
       const defaultWhere = {
         name: '',
+        code: '',
+        keyWords: '',
         factoryId: '',
         warehouseId: '',
-        code: '',
-        fixCode: '',
-        ownershipGroupId: ''
+        executeGroupId: '',
+        executorId: '',
+        status: ''
       };
       return {
+        defaultWhere: { ...defaultWhere },
         // 表单数据
         warehouseList: [],
+        userList: [],
+        statusOptions: [
+          {
+            value: 0,
+            label: '待审核'
+          },
+          {
+            value: 1,
+            label: '审核中'
+          },
+          {
+            value: 2,
+            label: '已审核'
+          }
+        ],
         factoryList: [],
         where: { ...defaultWhere },
         treeData: []
@@ -125,6 +172,22 @@
       this.getFactoryList();
     },
     methods: {
+      async nodeClick(id, data) {
+        this.where.executeGroupId = id;
+        if (data) {
+          this.where.executeGroupName = data.name;
+        }
+        this.where.executorName = '';
+        this.where.executorId = '';
+        if (id) {
+          let userData = await warehouseDefinition.getUserPage({
+            groupId: id,
+            size: 9999,
+            pageNum: 1
+          });
+          this.userList = userData.list;
+        }
+      },
       async getTreeData(val) {
         this.where.targetWarehouse = '';
         this.where.sourceWarehouse = '';

src/views/warehouseManagement/stocktaking/work/components/disposeDialog.vue

@@ -213,12 +213,7 @@
               prop="info.warehouseName"
               :show-overflow-tooltip="true"
             ></el-table-column>
-            <el-table-column
-              v-if="!isBindPlan"
-              label="操作"
-              width="100"
-              fixed="right"
-            >
+            <el-table-column label="操作" width="100" fixed="right">
               <template slot-scope="{ row, $index }">
                 <el-button
                   @click="deleted(row, $index)"

src/views/warehouseManagement/stocktaking/work/components/work-search.vue

@@ -46,32 +46,60 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="计划单号:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+          <el-input clearable v-model="where.planCode" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="盘点单号:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="盘点名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+        <el-form-item label="计划名称:">
+          <el-input clearable v-model="where.planName" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="盘点部门:">
-          <el-input clearable v-model="where.dep" placeholder="请输入" />
+          <DeptSelect v-model="where.executeGroupId" @input="nodeClick" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="状态:">
-          <el-input clearable v-model="where.dep" placeholder="请输入" />
+        <el-form-item label="盘点人员:">
+          <el-select
+            filterable
+            class="w100"
+            size="small"
+            v-model="where.executorId"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in userList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="盘点人员:">
-          <el-input clearable v-model="where.texture" placeholder="请输入" />
+        <el-form-item label="状态:">
+          <el-select
+            filterable
+            class="w100"
+            size="small"
+            v-model="where.status"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in statusOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }">
@@ -99,21 +127,48 @@
 </template>
 
 <script>
+  import DeptSelect from '@/components/CommomSelect/new-dept-select.vue';
   import storageApi from '@/api/warehouseManagement/index.js';
   import warehouseDefinition from '@/api/warehouseManagement/warehouseDefinition';
   export default {
+    components: { DeptSelect },
     data() {
       // 默认表单数据
       const defaultWhere = {
         name: '',
         factoryId: '',
         warehouseId: '',
+        executorId: '',
         code: '',
-        fixCode: '',
-        ownershipGroupId: ''
+        executeGroupId: '',
+        status: '',
+        planCode: '',
+        executeGroupName: '',
+        executorName: ''
       };
       return {
+        defaultWhere: { ...defaultWhere },
         // 表单数据
+        statusOptions: [
+          {
+            label: '待处理',
+            value: 0
+          },
+          {
+            label: '执行中',
+            value: 1
+          },
+          {
+            label: '已完成',
+            value: 2
+          }
+        ],
+        statusObj: {
+          0: '待处理',
+          1: '执行中',
+          2: '已完成'
+        },
+        userList: [],
         warehouseList: [],
         factoryList: [],
         where: { ...defaultWhere },
@@ -130,6 +185,22 @@
       this.getFactoryList();
     },
     methods: {
+      async nodeClick(id, data) {
+        this.where.executeGroupId = id;
+        if (data) {
+          this.where.executeGroupName = data.name;
+        }
+        this.where.executorName = '';
+        this.where.executorId = '';
+        if (id) {
+          let userData = await warehouseDefinition.getUserPage({
+            groupId: id,
+            size: 9999,
+            pageNum: 1
+          });
+          this.userList = userData.list;
+        }
+      },
       async getTreeData(val) {
         this.where.targetWarehouse = '';
         this.where.sourceWarehouse = '';

src/views/warehouseManagement/stocktaking/work/index.vue

@@ -84,7 +84,7 @@
             label: '计划单号',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 110
+            minWidth: 200
           },
           {
             prop: 'planName',

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.132:18086',
         // target: 'http://192.168.1.251:18086',
-        target: 'http://192.168.1.116:18086',
+        target: 'http://192.168.1.251:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''