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

src/views/basic/collectPoint/collectPointManage.vue

@@ -84,6 +84,7 @@
           <el-button type="primary" icon="el-icon-plus" @click="addCollectionPoints">新增采集点</el-button>
         </el-button-group>
       </div>
+        <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }"  @current-change="handCurrentChange" highlight-current-row
       >
         <el-table-column type="index" label="序号"></el-table-column>

src/views/basic/collectPoint/gatherOrderType.vue

@@ -26,7 +26,7 @@
           <el-button type="primary" icon="el-icon-plus" @click="addCollectionPoints">新增单据类型</el-button>
         </el-button-group>
       </div>
-
+      <el-divider style="margin: 15px"></el-divider>
 
       <el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }"
       >

src/views/basic/collectPoint/selectWorkplace.vue

@@ -35,6 +35,7 @@
           <el-button type="primary" icon="el-icon-plus" @click="addWork">选入工位</el-button>
         </el-button-group>
       </div>
+    <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }" highlight-current-row @current-change="handCurrentChange" ref="table"
       >
         <!--<el-table-column label width="45">-->

src/views/basic/collectPoint/userWorkplace.vue

@@ -32,15 +32,16 @@
             <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
           </el-button-group>
         </div>
+        <el-divider style="margin: 15px"></el-divider>
         <el-table v-loading="loading" :data="userList" style="width: 100%" :row-style="{height: '32px' }" ref="userTable"
                   @current-change="handCurrentChange" 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="userName" width="120"></el-table-column>
-          <el-table-column label="用户名称" prop="employeeName"></el-table-column>
+          <el-table-column label="用户名称" prop="employeeName" width="120"></el-table-column>
-          <el-table-column label="用户仓库" prop="invName"></el-table-column>
+          <el-table-column label="用户仓库" prop="invName" width="120"></el-table-column>
-          <el-table-column label="所属部门" prop="deptName"></el-table-column>
+          <el-table-column label="所属部门" prop="deptName" width="260"></el-table-column>
-          <el-table-column label="备注" prop="remark"></el-table-column>
+          <el-table-column label="备注" prop="remark" width="300"></el-table-column>
           <!--<el-table-column label="操作" fixed="right" width="100">-->
           <!--  <template slot-scope="scope">-->
           <!--    &lt;!&ndash;<el-button&ndash;&gt;-->
@@ -109,7 +110,7 @@
         >
           <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="workplaceName" width="140"></el-table-column>
           <el-table-column label="所属部门" prop="deptCodeName" width="90"></el-table-column>
           <el-table-column label="工位状态" prop="workplaceStatus" width="90">
             <template slot-scope="scope">
@@ -129,8 +130,8 @@
           <!--    <span>{{ corpTypeMap[scope.row.corpType] }}</span>-->
           <!--  </template>-->
           <!--</el-table-column>-->
-          <el-table-column label="创建时间" prop="createTime" width="90"></el-table-column>
+          <el-table-column label="创建时间" prop="createTime" width="140"></el-table-column>
-          <el-table-column label="备注" prop="remake" width="90"></el-table-column>
+          <el-table-column label="备注" prop="remake" width="240"></el-table-column>
           <el-table-column label="操作" fixed="right" width="100">
             <template slot-scope="scope">
               <el-button

src/views/basic/workplace/selectBusType.vue

@@ -26,7 +26,7 @@
           <el-button type="primary" icon="el-icon-plus" @click="chooseBusType">选入</el-button>
         </el-button-group>
       </div>
-
+    <el-divider style="margin: 15px"></el-divider>
 
       <el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }"
                 highlight-current-row @current-change="handCurrentChange" ref="table"

src/views/basic/workplace/workplaceManage.vue

@@ -101,6 +101,7 @@
                 <el-button type="primary" icon="el-icon-plus" @click="addWorkplace">新增工位</el-button>
               </el-button-group>
             </div>
+            <el-divider style="margin: 15px"></el-divider>
             <el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }"
                       highlight-current-row @current-change="handCurrentChange"
             >

src/views/collect/CollectOrderAllotCardComponents.vue

@@ -249,6 +249,8 @@
           </el-form-item>
         </el-form>
 
+        <el-divider style="margin: 15px"></el-divider>
+
         <el-row :gutter="24">
           <el-col v-for="(info, index)  in list" :key="index" :xs="12" :sm="8" :md="8" :lg="6">
             <el-card :body-style="{margin:'20px'}"

src/views/collect/fieldOperation.vue

@@ -20,13 +20,12 @@
 
 
     <el-row :gutter="8">
-      <el-col v-for="(info, index)  in stationList"  :key="index" :xs="12" :sm="8" :md="8" :lg="6">
+      <el-col v-for="(info, index)  in stationList"  :key="index" :xs="12" :sm="8" :md="8" :lg="6" >
         <el-card :body-style="{margin:'20px'}"
                  style="margin:20px 20px 20px 20px;height: 200px;background-color: #e1f3fb;border-radius: 12px; position: relative;"
-
         >
 
-          <div style="display: flex; justify-content: space-between; align-items: center; height: 66px; /* 约为 200px 的 1/3 */"  @click="handleClick(index)">
+          <div style="display: flex; justify-content: space-between; align-items: center; height: 66px; /* 约为 200px 的 1/3 */" >
             <p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.workplaceName }}</p> <!-- 假设你的信息对象中包含一个title属性 -->
 <!--            <div style="width: 60px; height: 60px;  display: flex; justify-content: center; align-items: center;">-->
 <!--              &lt;!&ndash; 二维码占位，这里用灰色方块代替 &ndash;&gt;-->
@@ -35,9 +34,9 @@
 
 <!--            </div>-->
           </div>
-          <div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"  @click="handleClick(index)">
+          <div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"  >
             <!-- 假设这里有一些信息内容 -->
-            <p style="font-size: 14px;background-color: #e1f3fb">{{ info.remake }}</p>
+            <p style="font-size: 14px;background-color: #e1f3fb" >{{ info.remake }}</p>
             <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb" @click="handleClick(index)">开始作业</el-button>
 
           </div>