2/26 优化1.0

src/views/basic/workplace/addBusTypeDialog.vue

@@ -275,34 +275,34 @@
 
       <el-divider></el-divider>
 
-<!--      <el-row :gutter="24" class="el-row">-->
-      <!--        <el-col :span="12" class="el-col">-->
-      <!--          <el-form-item label="回传系统:" prop="uploadIsMatching" class="query-form-item">-->
-      <!--            <el-select v-model="formData.uploadIsMatching" style="width: 80%" placeholder="是否配套系统"-->
-      <!--                       @change="changeUploadIsMatching"-->
-      <!--            >-->
-      <!--              <el-option label="内部" :value="0"></el-option>-->
-      <!--              <el-option label="外部" :value="1"></el-option>-->
-      <!--            </el-select>-->
-      <!--          </el-form-item>-->
-      <!--        </el-col>-->
-      <!--        <el-col :span="12" class="el-col">-->
-      <!--          <el-form-item label="回传单据类型:" prop="uploadDocumentTypeCode" class="query-form-item">-->
-      <!--            <el-select v-model="formData.uploadDocumentTypeCode" placeholder="请选择单据类型"-->
-      <!--                       style="width: 80%"-->
-      <!--            >-->
-      <!--              <el-option-->
-      <!--                v-for="item in uploadTypes"-->
-      <!--                :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-row>-->
+      <el-row :gutter="24" class="el-row">
+              <el-col :span="12" class="el-col">
+                <el-form-item label="回传系统:" prop="uploadIsMatching" class="query-form-item">
+                  <el-select v-model="formData.uploadIsMatching" style="width: 80%" placeholder="是否配套系统"
+                             @change="changeUploadIsMatching"
+                  >
+                    <el-option label="内部" :value="0"></el-option>
+                    <el-option label="外部" :value="1"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="回传单据类型:" prop="uploadDocumentTypeCode" class="query-form-item">
+                  <el-select v-model="formData.uploadDocumentTypeCode" placeholder="请选择单据类型"
+                             style="width: 80%"
+                  >
+                    <el-option
+                      v-for="item in uploadTypes"
+                      :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-row>
 
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -682,9 +682,11 @@ export default {
       }
     } else {
       this.getBusTypeList()
+      this.getUploadBusType()
     }
     this.getInvList()
     this.updateFormRules()
+
   }
 
 }

src/views/basic/workplace/busTypeManage.vue

@@ -64,6 +64,11 @@
             <span>{{ orderCirTypes[scope.row.orderCirType] }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="业务类型 " prop="busType" width="100">
+          <template slot-scope="scope">
+            <span>{{ busTypeMaps[scope.row.busType] }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="出入库方式" prop="inAndOutType" width="120">
           <template slot-scope="scope">
             <span>{{ inAndOutTypes[scope.row.inAndOutType] }}</span>
@@ -315,6 +320,10 @@ export default {
         1: '流通计量单位',
         2: '使用计量单位'
       },
+      busTypeMaps: {
+        1: '器械业务',
+        2: '药品业务'
+      },
       inAndOutTypes: {
         1: '入库',
         2: '出库',