Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

# Conflicts:
#	src/views/collect/DealOrder.vue

src/api/basic/collectPoint/collectPointManage.js

@@ -67,6 +67,15 @@ export function addTree(query) {
 }
 
 
+export function updateTree(query) {
+  return axios({
+    url: "udiwms/basic/collectPoint/category/updateTree",
+    method: "post",
+    data: query
+  });
+}
+
+
 export function deleteTree(query) {
   return axios({
     url: "udiwms/basic/collectPoint/category/deleteTree",

src/views/basic/collectPoint/selectWorkplace.vue

@@ -54,7 +54,7 @@
             <span>{{operationTypes[scope.row.operationType]}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="结果处理(是否插入)" prop="checkInsert" width="150">
+        <el-table-column label="结果处理" prop="checkInsert" width="150">
           <template slot-scope="scope">
             <span>{{checkInserts[scope.row.checkInsert]}}</span>
           </template>
@@ -73,12 +73,204 @@
             <el-button
               type="text"
               size="small"
+              @click="checkDetail(scope.row)"
             >详情
             </el-button>
             <!--@click.native.stop="printLabel(scope.row)"-->
           </template>
         </el-table-column>
       </el-table>
+
+    <el-dialog
+      title="工位详情"
+      :visible.sync="WorkplaceDialogVisible"
+      width="60%"
+      v-if="WorkplaceDialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <el-form :model="formData" style="width: 80%;" ref="dataForm" :rules="formRules"
+               label-width="auto"
+      >
+        <el-row :gutter="24" class="el-row">
+          <el-col :span="12" class="el-col">
+            <el-form-item label="工位编码:" prop="workplaceId" class="query-form-item">
+              <el-input
+                disabled
+                v-model="formData.workplaceId" style="width: 100%"
+                auto-complete="off"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="工位名称:" prop="" class="query-form-item">
+              <el-input
+                disabled
+                v-model="formData.workplaceName" style="width: 100%"
+                auto-complete="off"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24" class="el-row">
+          <el-col :span="12" class="el-col">
+            <el-form-item label="作业方式:" prop="operationType" class="query-form-item">
+              <el-select v-model="formData.operationType" style="width: 100%" placeholder="选择扫码方式" clearable disabled>
+                <el-option label="扫码生成业务单" :value="1"></el-option>
+                <el-option label="按单校验三期" :value="2"></el-option>
+                <el-option label="按单不校验三期" :value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="12" class="el-col">
+            <el-form-item label="结果处理:" prop="checkInsert" class="query-form-item">
+              <el-select v-model="formData.checkInsert" style="width: 100%" placeholder="选择扫码方式" clearable disabled>
+                <el-option label="不插入" :value="1"></el-option>
+                <el-option label="插入" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24" class="el-row">
+          <el-col :span="12" class="el-col">
+            <el-form-item label="提醒方式:" prop="warnType" class="query-form-item">
+              <el-select v-model="formData.warnType" style="width: 100%" placeholder="选择扫码方式" clearable disabled>
+                <el-option label="信息提醒" :value="1"></el-option>
+                <el-option label="禁止录入" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12" class="el-col">
+            <el-form-item label="往来类型标题:" prop="remake" class="query-form-item">
+              <el-input
+                disabled
+                v-model="formData.unitTittle" style="width: 100%"
+                auto-complete="off"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="来源单据类型编号:" prop="remake" class="query-form-item">
+              <el-input
+                disabled
+                v-model="formData.busTypeCode" style="width: 100%"
+                auto-complete="off"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="来源单据类型名称:" prop="remake" class="query-form-item">
+              <el-input
+                disabled
+                v-model="formData.busTypeName" style="width: 100%"
+                auto-complete="off"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <!--<el-col :span="24" class="el-col">-->
+          <!--  <el-form-item label="所属仓库:" prop="invCode" class="query-form-item">-->
+          <!--    <el-select v-model="formData.invCode" placeholder="请选择所属仓库"-->
+          <!--               style="width: 80%"-->
+          <!--               clearable-->
+          <!--               @change="handleInvChange"-->
+          <!--    >-->
+          <!--      <el-option-->
+          <!--        v-for="item in invList"-->
+          <!--        :key="item.name"-->
+          <!--        :label="item.name"-->
+          <!--        :value="item.code"-->
+          <!--      >-->
+          <!--        <span style="float: left">{{ item.name }}</span>-->
+          <!--      </el-option>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+          <el-col :span="12" class="el-col">
+            <el-form-item label="工位负责人:" prop="chargeUser" class="query-form-item">
+              <el-input
+                disabled
+                v-model="formData.employeeName" style="width: 100%"
+                auto-complete="off"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12" class="el-col">
+            <el-form-item label="作业方式:" prop="chargeUser" class="query-form-item">
+              <el-input
+                disabled
+                v-model="operationTypes[formData.operationType]" style="width: 100%"
+                auto-complete="off"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="创建时间:" prop="createTime" class="query-form-item">
+              <el-input
+                disabled
+                v-model="formData.createTime" style="width: 100%"
+                auto-complete="off"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <!--<el-col :span="24" class="el-col">-->
+          <!--  <el-form-item label="单据类型:" prop="busType" class="query-form-item">-->
+          <!--    <el-select v-model="formData.orderId" placeholder="请选择单据类型"-->
+          <!--               style="width: 80%"-->
+          <!--               clearable-->
+          <!--    >-->
+          <!--      <el-option-->
+          <!--        v-for="item in busTypes"-->
+          <!--        :key="item.name"-->
+          <!--        :label="item.name"-->
+          <!--        :value="item.code"-->
+          <!--      >-->
+          <!--        <span style="float: left">{{ item.name }}</span>-->
+          <!--      </el-option>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+          <!--<el-col :span="24" class="el-col">-->
+          <!--  <el-form-item label="所属组别:" prop="grouping" class="query-form-item">-->
+          <!--    <el-select v-model="formData.constituencies" placeholder="请选择所属组别"-->
+          <!--               style="width: 80%"-->
+          <!--               clearable-->
+          <!--    >-->
+          <!--      <el-option-->
+          <!--        v-for="item in fromDeptOptions"-->
+          <!--        :key="item.code"-->
+          <!--        :label="item.label"-->
+          <!--        :value="item.code"-->
+          <!--      >-->
+          <!--        <span style="float: left">{{ item.label }}</span>-->
+          <!--      </el-option>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+
+
+
+
+          <el-col :span="24" class="el-col">
+            <el-form-item label="备注:" prop="unitTittle" class="query-form-item">
+              <el-input
+                disabled
+                v-model="formData.remake" style="width: 100%"
+                auto-complete="off"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
@@ -125,6 +317,7 @@ export default {
       list: [],
       treeList: [],
       addWorkplaceDialogVisible: false,
+      WorkplaceDialogVisible: false,
       fromName: 'add',
       fromMap: {
         'add': '新增工位',
@@ -150,9 +343,9 @@ export default {
       users: [],
       busTypes: [],
       operationTypes: {
-        1: '扫码生成业务单(必须插入）',
-        2: '按单校验三期（是否插入可选）',
-        3: '按单不校验三期（是否插入可选）'
+        1: '扫码生成业务单',
+        2: '按单校验三期',
+        3: '按单不校验三期'
       },
       checkInserts: {
         1: '不插入',
@@ -378,6 +571,10 @@ export default {
           this.$message.error(res.message)
         }
       })
+    },
+    checkDetail(row){
+      this.formData = row
+      this.WorkplaceDialogVisible = true
     }
   },
   created() {

src/views/basic/collectPoint/userWorkplace.vue

@@ -56,7 +56,13 @@
           <!--  </template>-->
           <!--</el-table-column>-->
         </el-table>
-
+        <pagination
+          :total="userTotal"
+          :limit.sync="userQuery.limit"
+          :page.sync="userQuery.page"
+          @pagination="getUsers()"
+        >
+        </pagination>
       </div>
     </el-card>
     <el-tabs type="border-card" style="margin: 15px">
@@ -65,7 +71,7 @@
         <el-form :inline="true" :model="workQuery" class="query-form" size="mini">
           <el-form-item class="query-form-item" label="工位编码/工位名称:">
             <el-input
-              v-model="workQuery.key"
+              v-model="workQuery.workKey"
               placeholder="请输入工位编码/名称"
               clearable
             ></el-input>
@@ -102,7 +108,7 @@
               <span>{{ operationTypes[scope.row.operationType] }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="结果处理(是否插入)" prop="checkInsert" width="150">
+          <el-table-column label="结果处理" prop="checkInsert" width="150">
             <template slot-scope="scope">
               <span>{{ checkInserts[scope.row.checkInsert] }}</span>
             </template>
@@ -134,6 +140,13 @@
             </template>
           </el-table-column>
         </el-table>
+        <pagination
+          :total="workTotal"
+          :limit.sync="workQuery.limit"
+          :page.sync="workQuery.page"
+          @pagination=" getUserBindWork(workQuery)"
+        >
+        </pagination>
       </el-tab-pane>
 
     </el-tabs>
@@ -191,9 +204,9 @@
           <el-col :span="12" class="el-col">
             <el-form-item label="作业方式:" prop="operationType" class="query-form-item">
               <el-select v-model="formData.operationType" style="width: 100%" placeholder="选择扫码方式" clearable disabled>
-                <el-option label="扫码生成业务单(必须插入)" :value="1"></el-option>
-                <el-option label="按单校验三期（是否插入可选" :value="2"></el-option>
-                <el-option label="按单不校验三期（是否插入可选" :value="3"></el-option>
+                <el-option label="扫码生成业务单" :value="1"></el-option>
+                <el-option label="按单校验三期" :value="2"></el-option>
+                <el-option label="按单不校验三期" :value="3"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -340,14 +353,22 @@ export default {
         employeeName: '用户'
       },
       userQuery: {
-        invCode: this.$store.getters.locInvCode
+        page: 1,
+        limit: 10,
+        invCode: this.$store.getters.locInvCode,
+        key: ''
+      },
+      workQuery: {
+        page: 1,
+        limit: 10,
+        userId: '',
+        workKey: ''
       },
-      workQuery: {},
       selectUserWorkDialogVisible: false,
       operationTypes: {
-        1: '扫码生成业务单(必须插入）',
-        2: '按单校验三期（是否插入可选）',
-        3: '按单不校验三期（是否插入可选）'
+        1: '扫码生成业务单',
+        2: '按单校验三期',
+        3: '按单不校验三期'
       },
       checkInserts: {
         1: '不插入',
@@ -360,7 +381,8 @@ export default {
       userId: '',
       addWorkplaceDialogVisible: false,
       formData: null,
-
+      userTotal: 0,
+      workTotal: 0,
     }
   },
   methods: {
@@ -372,32 +394,35 @@ export default {
         path: ''
       })
       this.userQuery = {
+        page: 1,
+        limit: 10,
+        key: '',
         invCode: this.$store.getters.locInvCode
       }
       this.getUsers()
     },
     onSubmit() {
-      this.query.page = 1
+      this.userQuery.page = 1
       this.getUsers()
     },
     onUserReset() {
-      this.workQuery = {}
-      let query = {
-        userId:  this.rowData.id
+      this.workQuery = {
+        page: 1,
+        limit: 10,
+        userId: this.rowData.id,
+        workKey: ''
       }
-      this.getUserBindWork(query)
+      this.getUserBindWork(this.workQuery)
     },
     loadWorkList() {
-      let query = {
-        userId: this.rowData.id,
-        workKey:this.workQuery.key
-      }
-      this.getUserBindWork(query)
+      this.workQuery.userId = this.rowData.id
+      this.getUserBindWork(this.workQuery)
     },
     getUsers() {
       getUsers(this.userQuery).then(res => {
         if (res.code == 20000) {
-          this.userList = res.data || []
+          this.userList = res.data.list || []
+          this.userTotal = res.data.total
         } else {
           this.$message.error('获取错误')
         }
@@ -405,15 +430,14 @@ export default {
     },
     handCurrentChange(row) {
       this.rowData = row
-      let query = {
-        userId: row.id
-      }
-      this.getUserBindWork(query)
+      this.workQuery.userId = row.id
+      this.getUserBindWork(this.workQuery)
     },
     getUserBindWork(query){
       getUserBindWork(query).then(res => {
         if (res.code == 20000) {
-          this.workList = res.data || []
+          this.workList = res.data.list || []
+          this.workTotal= res.data.total || 0
         } else {
           this.$message.error('获取失败')
         }
@@ -427,16 +451,8 @@ export default {
       this.selectUserWorkDialogVisible = true
     },
     closeDialog() {
-      let query = {
-        userId: this.userId
-      }
-      getUserBindWork(query).then(res => {
-        if (res.code == 20000) {
-          this.workList = res.data || []
-        } else {
-          this.$message.error('获取失败')
-        }
-      })
+      this.workQuery.userId = this.rowData.id
+      this.getUserBindWork(this.workQuery)
       this.selectUserWorkDialogVisible = false
     },
     remove(row) {

src/views/basic/workplace/workplaceManage.vue

@@ -21,7 +21,8 @@
                     size="mini"
                     style="margin-left: 10px"
                     v-if="data.parentCode == null"
-                    @click="() => append(data,'add')">
+                    @click="() => append(data,'add')"
+                  >
                   新增
                 </el-button>
                 <el-button
@@ -29,14 +30,16 @@
                   size="mini"
                   style="margin-left: 10px"
                   :disabled="data.parentCode == null"
-                  @click="() => append(data, 'edit')">
+                  @click="() => append(data, 'edit')"
+                >
             编辑
           </el-button>
           <el-button
             type="text"
             size="mini"
             :disabled="data.parentCode == null"
-            @click="delTree(data)">
+            @click="delTree(data)"
+          >
             删除
           </el-button>
 
@@ -46,174 +49,194 @@
           </el-col>
         </el-col>
 
-      <el-button
-        type="success"
-        @click="Dictionary = !Dictionary"
-        icon="el-icon-arrow-left"
-        v-show="Dictionary"
-        class="iconButton"
-      >
-      </el-button>
-      <el-button
-        type="success"
-        @click="Dictionary = !Dictionary"
-        icon="el-icon-arrow-right"
-        v-show="!Dictionary"
-        class="iconButton"
-      >
-      </el-button>
-      <el-col style="border-left: 3px solid #dddddd; overflow-y: hidden">
-      <el-form :model="query" label-width="auto" v-show="showSearch" size="mini" class="order-el-form">
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="当前仓库:" class="query-form-item">
-              <invSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="编码/名称:" class="query-form-item">
-              <el-input v-model="query.key" placeholder="请输入编码/工位名称" clearable>
-              </el-input>
-              <!--<el-form-item label="所属仓库:">-->
-
-              <!--              :isDisable.sync="defaultInv"-->
-              <!--</el-form-item>-->
-              <!--<el-select-->
-              <!--  v-model="query.key"-->
-              <!--  placeholder="请选择仓库">-->
-              <!--  <el-option v-for="item in unitStorageList"-->
-              <!--             :key="item.name"-->
-              <!--             :label="item.name"-->
-              <!--             :value="item.code"></el-option>-->
-              <!--</el-select>-->
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+        <el-button
+          type="success"
+          @click="Dictionary = !Dictionary"
+          icon="el-icon-arrow-left"
+          v-show="Dictionary"
+          class="iconButton"
+        >
+        </el-button>
+        <el-button
+          type="success"
+          @click="Dictionary = !Dictionary"
+          icon="el-icon-arrow-right"
+          v-show="!Dictionary"
+          class="iconButton"
+        >
+        </el-button>
 
-      <div class="top-right-btn">
-        <el-button-group>
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-          <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="addWorkplace">新增工位</el-button>
-        </el-button-group>
-      </div>
 
-      <el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }" highlight-current-row @current-change="handCurrentChange"
-      >
-        <el-table-column type="index" label="序号"></el-table-column>
-        <el-table-column label="工位编码" prop="workplaceId" width="90"></el-table-column>
-        <el-table-column label="工位名称" prop="workplaceName" width="90"></el-table-column>
-        <el-table-column label="所属组别" prop="categoryName" width="90"></el-table-column>
-        <el-table-column label="来源单据类型编号" prop="busTypeCode" width="150"></el-table-column>
-        <el-table-column label="来源单据类型名称" prop="busTypeName" width="150"></el-table-column>
-        <el-table-column label="所属仓库" prop="invName" width="90"></el-table-column>
-        <el-table-column label="作业方式" prop="operationType" width="90">
-          <template slot-scope="scope">
-            <span>{{operationTypes[scope.row.operationType]}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="结果处理(是否插入)" prop="checkInsert" width="150">
-          <template slot-scope="scope">
-            <span>{{checkInserts[scope.row.checkInsert]}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="提醒方式" prop="warnType" width="90">
-          <template slot-scope="scope">
-            <span>{{warnTypeMap[scope.row.warnType]}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="负责人" prop="employeeName" width="90"></el-table-column>
-        <el-table-column label="往来单位标题" prop="unitTittle" width="90"></el-table-column>
-        <el-table-column label="创建时间" prop="createTime" width="90"></el-table-column>
-        <el-table-column label="备注" prop="remake" width="90"></el-table-column>
-        <el-table-column label="操作" fixed="right" width="120">
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="printLabel(scope.row)"
-            >打印
-            </el-button>
-
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="edit(scope.row)"
-            >编辑
-            </el-button>
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="deleteWorkplace(scope.row)"
-            >删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-
-        <el-form :inline="true" :model="userQuery" class="query-form" size="mini" style="margin-top: 30px;margin-bottom: 10px" v-if="rowData != null">
-          <el-form-item class="query-form-item" label="工位编码/工位名称:">
-            <el-input
-              v-model="userQuery.key"
-              placeholder="请输入工位编码/名称"
-              clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item>
+
+        <el-col style="border-left: 3px solid #dddddd; overflow-y: hidden">
+          <el-card>
+          <el-form :model="query" label-width="auto" v-show="showSearch" size="mini" class="order-el-form">
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="当前仓库:" class="query-form-item">
+                  <invSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="编码/名称:" class="query-form-item">
+                  <el-input v-model="query.key" placeholder="请输入编码/工位名称" clearable>
+                  </el-input>
+                  <!--<el-form-item label="所属仓库:">-->
+
+                  <!--              :isDisable.sync="defaultInv"-->
+                  <!--</el-form-item>-->
+                  <!--<el-select-->
+                  <!--  v-model="query.key"-->
+                  <!--  placeholder="请选择仓库">-->
+                  <!--  <el-option v-for="item in unitStorageList"-->
+                  <!--             :key="item.name"-->
+                  <!--             :label="item.name"-->
+                  <!--             :value="item.code"></el-option>-->
+                  <!--</el-select>-->
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div class="top-right-btn">
             <el-button-group>
-              <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                @click="onUserReset"
-              >重置
-              </el-button>
-              <el-button type="primary" @click="loadUserList"
-                         icon="el-icon-search"
-              >查询
-              </el-button
-              >
+              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+              <el-button type="primary" icon="el-icon-plus" @click="addWorkplace">新增工位</el-button>
             </el-button-group>
-          </el-form-item>
-        </el-form>
+          </div>
+          <el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }"
+                    highlight-current-row @current-change="handCurrentChange"
+          >
+            <el-table-column type="index" label="序号"></el-table-column>
+            <el-table-column label="工位编码" prop="workplaceId" width="90"></el-table-column>
+            <el-table-column label="工位名称" prop="workplaceName" width="90"></el-table-column>
+            <el-table-column label="所属组别" prop="categoryName" width="90"></el-table-column>
+            <el-table-column label="来源单据类型编号" prop="busTypeCode" width="150"></el-table-column>
+            <el-table-column label="来源单据类型名称" prop="busTypeName" width="150"></el-table-column>
+            <el-table-column label="所属仓库" prop="invName" width="90"></el-table-column>
+            <el-table-column label="作业方式" prop="operationType" width="90">
+              <template slot-scope="scope">
+                <span>{{ operationTypes[scope.row.operationType] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="结果处理" prop="checkInsert" width="150">
+              <template slot-scope="scope">
+                <span>{{ checkInserts[scope.row.checkInsert] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="提醒方式" prop="warnType" width="90">
+              <template slot-scope="scope">
+                <span>{{ warnTypeMap[scope.row.warnType] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="负责人" prop="employeeName" width="90"></el-table-column>
+            <el-table-column label="往来单位标题" prop="unitTittle" width="90"></el-table-column>
+            <el-table-column label="创建时间" prop="createTime" width="90"></el-table-column>
+            <el-table-column label="备注" prop="remake" width="90"></el-table-column>
+            <el-table-column label="操作" fixed="right" width="120">
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.native.stop="printLabel(scope.row)"
+                >打印
+                </el-button>
 
-        <el-table v-loading="userLoading" :data="userList" style="width: 100%;" :row-style="{height: '32px' }" v-if="rowData != null"
-                 highlight-current-row
-        >
-          <el-table-column type="index" label="序号"></el-table-column>
-          <el-table-column label="用户账号" prop="userName"></el-table-column>
-          <el-table-column label="用名称" prop="employeeName"></el-table-column>
-          <el-table-column label="备注" prop="remark"></el-table-column>
-          <el-table-column label="操作" fixed="right" width="50">
-            <template slot-scope="scope">
-              <!--<el-button-->
-              <!--  type="text"-->
-              <!--  size="small"-->
-              <!--  @click.native.stop="printLabel(scope.row)"-->
-              <!--&gt;打印-->
-              <!--</el-button>-->
-              <!--<el-button-->
-              <!--  type="text"-->
-              <!--  size="small"-->
-              <!--  @click.native.stop="editCollectionPoints(scope.row)"-->
-              <!--&gt;详情-->
-              <!--</el-button>-->
-              <el-button
-                type="text"
-                size="small"
-                @click.native.stop="removeUser(scope.row)"
-              >移除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-
-      </el-col>
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.native.stop="edit(scope.row)"
+                >编辑
+                </el-button>
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.native.stop="deleteWorkplace(scope.row)"
+                >删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+            <pagination
+              :total="total"
+              :limit.sync="query.limit"
+              :page.sync="query.page"
+              @pagination="getList"
+            >
+            </pagination>
+        </el-card>
+          <el-card>
+            <el-form :inline="true" :model="userQuery" class="query-form" size="mini"
+                     style="margin-top: 30px;margin-bottom: 10px" v-if="rowData != null"
+            >
+              <el-form-item class="query-form-item" label="工位编码/工位名称:">
+                <el-input
+                  v-model="userQuery.userKey"
+                  placeholder="请输入工位编码/名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-button-group>
+                  <el-button
+                    type="primary"
+                    icon="el-icon-refresh"
+                    @click="onUserReset"
+                  >重置
+                  </el-button>
+                  <el-button type="primary" @click="loadUserList"
+                             icon="el-icon-search"
+                  >查询
+                  </el-button
+                  >
+                </el-button-group>
+              </el-form-item>
+            </el-form>
 
+            <el-table v-loading="userLoading" :data="userList" style="width: 100%;" :row-style="{height: '32px' }"
+                      v-if="rowData != null"
+                      highlight-current-row
+            >
+              <el-table-column type="index" label="序号"></el-table-column>
+              <el-table-column label="用户账号" prop="userName"></el-table-column>
+              <el-table-column label="用名称" prop="employeeName"></el-table-column>
+              <el-table-column label="备注" prop="remark"></el-table-column>
+              <el-table-column label="操作" fixed="right" width="50">
+                <template slot-scope="scope">
+                  <!--<el-button-->
+                  <!--  type="text"-->
+                  <!--  size="small"-->
+                  <!--  @click.native.stop="printLabel(scope.row)"-->
+                  <!--&gt;打印-->
+                  <!--</el-button>-->
+                  <!--<el-button-->
+                  <!--  type="text"-->
+                  <!--  size="small"-->
+                  <!--  @click.native.stop="editCollectionPoints(scope.row)"-->
+                  <!--&gt;详情-->
+                  <!--</el-button>-->
+                  <el-button
+                    type="text"
+                    size="small"
+                    @click.native.stop="removeUser(scope.row)"
+                  >移除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+            <pagination
+              :total="userTotal"
+              :limit.sync="userQuery.limit"
+              :page.sync="userQuery.page"
+              @pagination="getUserBindWork(userQuery)"
+            >
+            </pagination>
+          </el-card>
+        </el-col>
 
       </el-row>
+
     </el-card>
     <el-dialog
       :title="fromMap[fromName]"
@@ -249,9 +272,9 @@
           <el-col :span="24" class="el-col">
             <el-form-item label="作业方式:" prop="operationType" class="query-form-item">
               <el-select v-model="formData.operationType" style="width: 80%" placeholder="选择扫码方式" clearable>
-                <el-option label="扫码生成业务单(必须插入)" :value="1"></el-option>
-                <el-option label="按单校验三期（是否插入可选" :value="2"></el-option>
-                <el-option label="按单不校验三期（是否插入可选" :value="3"></el-option>
+                <el-option label="扫码生成业务单" :value="1"></el-option>
+                <el-option label="按单校验三期" :value="2"></el-option>
+                <el-option label="按单不校验三期" :value="3"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -331,23 +354,23 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24" class="el-col">
-            <el-form-item label="所属组别:" prop="grouping" class="query-form-item">
-              <el-select v-model="formData.constituencies" placeholder="请选择所属组别"
-                         style="width: 80%"
-                         clearable
-              >
-                <el-option
-                  v-for="item in fromDeptOptions"
-                  :key="item.code"
-                  :label="item.label"
-                  :value="item.code"
-                >
-                  <span style="float: left">{{ item.label }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="24" class="el-col">-->
+          <!--  <el-form-item label="所属组别:" prop="grouping" class="query-form-item">-->
+          <!--    <el-select v-model="formData.constituencies" placeholder="请选择所属组别"-->
+          <!--               style="width: 80%"-->
+          <!--               clearable-->
+          <!--    >-->
+          <!--      <el-option-->
+          <!--        v-for="item in fromDeptOptions"-->
+          <!--        :key="item.code"-->
+          <!--        :label="item.label"-->
+          <!--        :value="item.code"-->
+          <!--      >-->
+          <!--        <span style="float: left">{{ item.label }}</span>-->
+          <!--      </el-option>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
 
 
           <el-col :span="24" class="el-col">
@@ -391,7 +414,7 @@
       width="60%"
       top="5vh"
     >
-      <el-form :model="subData" ref="dataForm"  label-width="80px">
+      <el-form :model="subData" ref="dataForm" label-width="80px">
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="12" class="el-col">
             <el-form-item label="上级菜单" prop="parentCode">
@@ -404,7 +427,8 @@
                   v-for="item in fromDeptOptions"
                   :key="item.parentCode"
                   :label="item.parentName"
-                  :value="item.parentCode">
+                  :value="item.parentCode"
+                >
                   <span style="float: left">{{ item.parentName }}</span>
                 </el-option>
               </el-select>
@@ -454,10 +478,10 @@ import {
   addWorkplace,
   updateWorkplace,
   deleteWorkplace,
-  createWorkplaceId, printWorkLabel,getUsers
+  createWorkplaceId, printWorkLabel, getUsers
 } from '@/api/basic/sysWorkplaceManage'
 import { getInvListByUser } from '@/api/system/invWarehouse'
-import { addTree, deleteTree, getTree } from '@/api/basic/collectPoint/collectPointManage'
+import { addTree, deleteTree, getTree, updateTree } from '@/api/basic/collectPoint/collectPointManage'
 import { getCollectBusType } from '@/api/basic/collectPoint/gatherOrderType'
 import panelGroup from '@/views/dashboard/PanelGroup'
 import { delUserBindWork, getUserBindWork } from '@/api/basic/collectPoint/userWorkplace'
@@ -468,14 +492,20 @@ export default {
       query: {
         invCode: this.$store.getters.locInvCode,
         page: 1,
-        limit: 20,
+        limit: 10,
         code: null
       },
       showSearch: true,
       Dictionary: true,
       loading: false,
       list: [],
-      treeList: [],
+      treeList: [
+        {
+          code: 1001,
+          parentCode: null,
+          label: '全部'
+        }
+      ],
       addWorkplaceDialogVisible: false,
       fromName: 'add',
       fromMap: {
@@ -511,29 +541,37 @@ export default {
       users: [],
       busTypes: [],
       operationTypes: {
-        1: '扫码生成业务单(必须插入）',
-        2: '按单校验三期（是否插入可选）',
-        3: '按单不校验三期（是否插入可选）'
+        1: '扫码生成业务单',
+        2: '按单校验三期',
+        3: '按单不校验三期'
       },
       checkInserts: {
         1: '不插入',
-        2: '插入',
+        2: '插入'
       },
       warnTypeMap: {
         1: '信息提醒',
-        2: '禁止录入',
+        2: '禁止录入'
       },
       userList: [],
       userLoading: false,
       rowData: null,
-      userQuery: {},
+      userQuery: {
+        page: 1,
+        limit: 10,
+        userKey: null,
+        workplaceId: null
+      },
       formName: 'add',
       formMap: {
-        add: "新增",
-        edit: "编辑"
+        add: '新增',
+        edit: '编辑'
       },
       subFormVisible: false,
       subData: {},
+      groupData: null,
+      total: 0,
+      userTotal: 0
     }
   },
   methods: {
@@ -560,6 +598,7 @@ export default {
           return this.$message.error('错误错误')
         }
         this.list = res.data.list || []
+        this.total = res.data.total || 0
       })
     },
     addWorkplace() {
@@ -603,6 +642,7 @@ export default {
         })
     },
     formSubmit() {
+      this.formData.constituencies = this.groupData.code
       if (this.fromName == 'add') {
         this.$refs['dataForm'].validate((valid) => {
           if (!valid) {
@@ -614,6 +654,10 @@ export default {
               }
               this.addWorkplaceDialogVisible = false
               this.$message.success(res.data)
+              this.query.code = this.groupData.code
+              if (this.query.code == 1001) {
+                this.query.code = null
+              }
               this.getList()
             }).catch(() => {
               this.addWorkplaceDialogVisible = false
@@ -694,14 +738,18 @@ export default {
         this.loading = false
       })
     },
-    getLstTree(){
+    getLstTree() {
       getTree(this.query)
         .then((response) => {
-          var invlist = response.data || [];
-          this.treeList = this.handleTree(invlist, "code", "parentCode");
+          var invlist = response.data || []
+          if (invlist.length == 0) {
+            this.treeList = this.handleTree(this.treeList, 'code', 'parentCode')
+          } else {
+            this.treeList = this.handleTree(invlist, 'code', 'parentCode')
+          }
         })
         .catch(() => {
-        });
+        })
     },
     getBusType() {
       let query = {
@@ -727,31 +775,29 @@ export default {
         .catch(() => {
         })
     },
-    handCurrentChange(row){
+    handCurrentChange(row) {
       this.rowData = row
-      let query = {
-        workplaceId: row.workplaceId
-      }
-      this.getUserBindWork(query)
+      this.userQuery.workplaceId = row.workplaceId
+      this.getUserBindWork(this.userQuery)
     },
-    loadUserList(){
-      let query = {
-        workplaceId: this.rowData.workplaceId,
-        userKey : this.userQuery.key
-      }
-      this.getUserBindWork(query)
+    loadUserList() {
+      this.userQuery.workplaceId = this.rowData.workplaceId
+      this.getUserBindWork(this.userQuery)
     },
-    onUserReset(){
-      this.userQuery = {}
-      let query = {
-        workplaceId: this.rowData.workplaceId,
+    onUserReset() {
+      this.userQuery = {
+        page: 1,
+        limit: 10,
+        userKey: null,
+        workplaceId: this.rowData.workplaceId
       }
-      this.getUserBindWork(query)
+      this.getUserBindWork(this.userQuery)
     },
-    getUserBindWork(query){
+    getUserBindWork(query) {
       getUserBindWork(query).then(res => {
         if (res.code == 20000) {
-          this.userList = res.data || []
+          this.userList = res.data.list || []
+          this.userTotal = res.data.total || 0
         } else {
           this.$message.error('获取失败')
         }
@@ -764,16 +810,14 @@ export default {
         type: 'warning'
       }).then(() => {
         let query = {
-          id : row.id
+          id: row.id
         }
         delUserBindWork(query).then(res => {
           if (res.code == 20000) {
-            let query = {
-              workplaceId: this.rowData.workplaceId
-            }
-            this.getUserBindWork(query)
+            this.userQuery.workplaceId = this.rowData.workplaceId
+            this.getUserBindWork(this.userQuery)
             this.$message.success('移除成功')
-          }else {
+          } else {
             this.$message.error(res.message)
           }
         })
@@ -781,51 +825,69 @@ export default {
 
       })
     },
-    handleNodeClick(row){
+    handleNodeClick(row) {
+      this.groupData = row
       this.query.code = row.code
-      if (this.query.code == 1001){
+      if (this.query.code == 1001) {
         this.query.code = null
       }
       this.getList()
     },
     append(data, formName) {//新增 编辑
-      this.formName = formName;
-      if (formName === "edit") {
-        this.subData = JSON.parse(JSON.stringify(data));
-        this.subData.name = JSON.parse(JSON.stringify(data.label));
-      } else if (formName === "add") {
+      this.formName = formName
+      if (formName === 'edit') {
+        this.subData = JSON.parse(JSON.stringify(data))
+        this.subData.name = JSON.parse(JSON.stringify(data.label))
+      } else if (formName === 'add') {
         this.subData = {
           parentCode: JSON.parse(JSON.stringify(data)).code
-        };
+        }
         let parentData = {
           parentCode: JSON.parse(JSON.stringify(data)).code,
           parentName: JSON.parse(JSON.stringify(data.label))
         }
         this.fromDeptOptions.push(parentData)
       }
-      this.subFormVisible = true;
+      this.subFormVisible = true
     },
-    delTree(row){
+    delTree(row) {
       deleteTree(row).then(res => {
-        if (res.code == 20000){
-          this.$message.success("删除成功")
-          this.getLstTree()
-        }else {
-          this.$message.error("删除失败")
-        }
-      })
-    },
-    forInvSubmit(){
-      addTree(this.subData).then(res => {
-        if (res.code == 20000){
-          this.subFormVisible = false
+        if (res.code == 20000) {
+          this.$message.success('删除成功')
           this.getLstTree()
-          this.$message.success("成功")
-        }else {
-          this.$message.error(res.message)
+        } else {
+          this.$message.error('删除失败')
         }
       })
     },
+    forInvSubmit() {
+      if (this.formName === 'edit'){
+        updateTree(this.subData).then(res => {
+          if (res.code == 20000){
+            this.subFormVisible = false
+            this.getLstTree()
+            this.$message.success('成功')
+          }else {
+            this.$message.error(res.message)
+          }
+        }).catch(() => {
+
+        })
+      }else {
+        addTree(this.subData).then(res => {
+          if (res.code == 20000) {
+            this.subFormVisible = false
+            this.getLstTree()
+            this.$message.success('成功')
+          } else {
+            this.$message.error(res.message)
+          }
+        }).catch(() => {
+
+        })
+      }
+
+    }
   },
   created() {
     this.getList()

src/views/collect/DealOrder.vue

@@ -127,7 +127,7 @@
       </el-tabs>
 
       <el-dialog
-        title="选择处方"
+        title="选入业务单据"
         :visible.sync="selectPrescriptionVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
@@ -207,7 +207,7 @@ export default {
   methods: {
     handleClick(blankName) {
       // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId
-      let url = window.location.origin+`#/`+ blankName+`?workplaceId=`+ this.workplaceId
+      let url = window.location.origin + `#/` + blankName + `?workplaceId=` + this.workplaceId
       // this.$router.push( workplaceId)
       window.open(url, '_blank');
     },

src/views/collect/PanelOrderDeal.vue

@@ -245,10 +245,8 @@ import addOrder from "@/views/inout/DialogCreateOrder";
 import errOrder from "@/views/inout/IoCreateErrorOrder";
 import {executeFuc, getHead} from "@/utils/customConfig";
 import {convertDate} from "@/utils/date";
-import {page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescribeApi";
-import prescribeCodePanel from "@/views/collect/prescribe/prescribeCodePanel";
-import prescribeOriginPanel from "@/views/collect/prescribe/prescribeOriginPanel";
-import prescribeOriginDiPanel from "@/views/collect/prescribe/prescribeOriginDiPanel";
+import prescribeOriginPanel from "@/views/collect/PannelOrderBiz";
+import prescribeCodePanel from "@/views/collect/PanelOrderTagCode";
 import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
 
 export default {
@@ -307,7 +305,7 @@ export default {
   },
 
   components: {
-    addOrder, errOrder, prescribeOriginPanel, prescribeOriginDiPanel, prescribeCodePanel
+    addOrder, errOrder, prescribeOriginPanel, prescribeCodePanel
   },
   methods: {
 

src/views/collect/PanelOrderEndSearch.vue

@@ -246,9 +246,8 @@ import addOrder from "@/views/inout/DialogCreateOrder";
 import errOrder from "@/views/inout/IoCreateErrorOrder";
 import {executeFuc, getHead} from "@/utils/customConfig";
 import {convertDate} from "@/utils/date";
-import {detail, page as prescribePage} from "@/api/basic/sicker/prescribeApi";
 import prescribeCodePanel from "./PanelOrderTagCode";
-import prescribeOriginPanel from "@/views/collect/prescribe/prescribeOriginPanel";
+import prescribeOriginPanel from "@/views/collect/PannelOrderBiz";
 import {orderPage} from "@/api/collect/collectOrder";
 
 export default {

src/views/collect/PanelOrderTagCode.vue

@@ -191,7 +191,7 @@ export default {
     },
     ///界面配置相关------------end
 
-    getCodeDetail(_this) {
+    getList(_this) {
       if (this.prescribeData == null)
         return
       if (this.prescribeData != null) {

src/views/collect/PannelOrderBiz.vue

@@ -220,7 +220,7 @@ export default {
           _this.$message.error(res.message)
           return
         }
-        _this.preDetailList = res.data.items
+        _this.preDetailList = res.data.list
         _this.preLoading = false
       }).catch(() => {
         _this.preLoading = false

src/views/collect/selectCollectOrderDialog.vue

@@ -234,6 +234,7 @@ import {convertDate} from "@/utils/date";
 import {page as prescribePage} from "@/api/basic/sicker/prescribeApi";
 import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownloadDialog";
 import prescribeOriginPanel from "./PannelOrderBiz";
+import {orderPage} from "@/api/collect/collectOrder";
 
 export default {
   name: "selectPrescribeDialog",
@@ -324,7 +325,7 @@ export default {
 
     getList() {
       this.loading = true;
-      prescribePage(this.filterQuery).then(res => {
+      orderPage(this.filterQuery).then(res => {
         this.loading = false
         this.list = res.data.list || []
         this.total = res.data.total || 0