界面配置一些微调

src/views/basic/workplace/workplaceManage.vue

@@ -271,7 +271,7 @@
               <el-form :inline="true" :model="userQuery" class="query-form" size="mini"
                        style="margin-bottom: 10px"
               >
-                <el-form-item class="query-form-item" label="用户账号/用户名称:">
+                <el-form-item class="query-form-item" label="用户账号/名称:">
                   <el-input
                     v-model="userQuery.userKey"
                     placeholder="请输入用户账号/名称"
@@ -302,7 +302,7 @@
                 <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">
+                <el-table-column label="操作" fixed="right" width="80">
                   <template slot-scope="scope">
                     <el-button
                       type="text"

src/views/collect/CollectOrderEndBlank.vue

@@ -1,21 +1,15 @@
 <template>
   <div>
 
-    <el-row :gutter="0"  v-if="isLinkDisabled" style="margin-top: 15px">
+    <el-row :gutter="0" v-if="isLinkDisabled">
       <el-col :span="24" align="right">
         <div class="inv-hos-title">
             <span
               style="margin: 10px;color: #2d8cf0;font-size: 14px;"
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-          <span
-            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;"
-          >仓库&nbsp:&nbsp{{ this.userInfo.inv }}</span>
-          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{
-              this.userInfo.companyName
-            }}</span>
           <span
             style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
-          >({{
+          >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{
               this.userInfo.userName
             }})</span>
         </div>
@@ -24,20 +18,10 @@
 
 
 
-    <el-tabs type="border-card" style="margin: 15px">
+    <prescribePanel
-
+      :RowType="type"
-      <el-tab-pane label="已完成赋码单据">
-        <prescribePanel
-          style="margin: -15px"
-        ></prescribePanel>
-      </el-tab-pane>
-
-      <el-tab-pane label="扫码查询">
-        <codePanel style="margin: -15px"
-        ></codePanel>
-      </el-tab-pane>
 
-    </el-tabs>
+    ></prescribePanel>
 
 
   </div>
@@ -58,6 +42,7 @@ export default {
   },
   data() {
     return {
+      type: 1,
       isLinkDisabled: false,
       userInfo: {
         inv: this.$store.getters.locInvName,

src/views/collect/DealOrder.vue

@@ -9,9 +9,6 @@
             <span
               style="margin: 10px;color: #2d8cf0;font-size: 14px;"
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-              <!--              <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">{{-->
-              <!--                  this.userInfo.companyName-->
-              <!--                }}</span>-->
               <span
                 style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
               >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{

src/views/collect/IoCreateOrder.vue

@@ -30,7 +30,7 @@
         </el-row>
 
         <el-alert
-          style="margin-top: 15px;margin-bottom: 10px;font-size: 20px;"
+          style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"
           :title="msgTip"
           :closable="false"
           type="warning">

src/views/collect/IoSplitFifoCodePanel.vue

@@ -4,19 +4,19 @@
       <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
                size="mini" label-width="100px">
         <el-row style=" display:flex;  flex-wrap: wrap; ">
-          <el-col :span="20">
+<!--          <el-col :span="20">-->
-            <el-form-item prop="code" label="扫码查询:">
+<!--            <el-form-item prop="code" label="扫码查询:">-->
-              <el-input
+<!--              <el-input-->
-                id="inputer"
+<!--                id="inputer"-->
-                @focus="getInputFocus($event)"
+<!--                @focus="getInputFocus($event)"-->
-                @keypress.enter.native="enterKey($event)"
+<!--                @keypress.enter.native="enterKey($event)"-->
-                ref="inputRef"
+<!--                ref="inputRef"-->
-                style="ime-mode: disabled"
+<!--                style="ime-mode: disabled"-->
-                type="tel"
+<!--                type="tel"-->
-                v-model="filterQuery.code"
+<!--                v-model="filterQuery.code"-->
-              ></el-input>
+<!--              ></el-input>-->
-            </el-form-item>
+<!--            </el-form-item>-->
-          </el-col>
+<!--          </el-col>-->
           <!--<el-col :span="20">-->
           <!--  <el-form-item prop="code" label="查询:">-->
           <!--    <el-input-->

src/views/collect/ioSplitFifoCode.vue

@@ -1,22 +1,14 @@
 <template>
   <div>
-
+    <el-row :gutter="0" v-if="isLinkDisabled">
-
-    <el-row :gutter="0"  v-if="isLinkDisabled" style="margin-top: 15px">
       <el-col :span="24" align="right">
         <div class="inv-hos-title">
             <span
               style="margin: 10px;color: #2d8cf0;font-size: 14px;"
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-          <span
-            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;"
-          >仓库&nbsp:&nbsp{{ this.userInfo.inv }}</span>
-          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{
-              this.userInfo.companyName
-            }}</span>
           <span
             style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
-          >({{
+          >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{
               this.userInfo.userName
             }})</span>
         </div>