Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/views/basic/workplace/addBusTypeDialog.vue

@@ -109,6 +109,14 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="是否上传医保:" prop="uploadYb" class="query-form-item">
+            <el-select v-model="formData.uploadYb" style="width: 80%" placeholder="出入库方式">
+              <el-option label="是" :value="1"></el-option>
+              <el-option label="否" :value="0"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
 
       <el-divider></el-divider>
@@ -347,6 +355,7 @@ export default {
         warnType: 2,
         workplaceType: 3,
         autoTag: 0,
+        uploadYb: 0,
         monopoly: 0,
         orderFinishVerify: 0,
         isPopular: 1,

src/views/basic/workplace/busTypeManage.vue

@@ -95,6 +95,11 @@
             <span>{{ autoHandles[scope.row.autoHandle] }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="是否上传医保" prop="uploadYb" width="100">
+          <template slot-scope="scope">
+            <span>{{ uploadYb[scope.row.uploadYb] }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="发货方" prop="shipper" width="100">
           <template slot-scope="scope">
             <span>{{ shippers[scope.row.shipper] }}</span>
@@ -334,6 +339,10 @@ export default {
         1: '是',
         0: '否',
       },
+      uploadYb: {
+        1: '是',
+        0: '否',
+      },
       autoHandles: {
         'false': '否',
         'true' : '是',