9/6 youhua

src/views/basic/product/drug/chooseHouseDrug.vue

@@ -16,7 +16,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="包装规格:">
+            <el-form-item label="制剂规格:">
               <el-input v-model="erpQuery.spec" style="width: 90%" placeholder="请输入包装规格" clearable="true"
                         @keyup.enter.native="keyupErp_submit($event)"></el-input>
             </el-form-item>
@@ -82,11 +82,12 @@
         </el-table-column>
         <!--<el-table-column v-if="!isImport" type="selection" width="55"></el-table-column>-->
         <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="医保编码" prop="ybbm"></el-table-column>
         <el-table-column label="物资编码" prop="code"></el-table-column>
         <el-table-column label="物资名称" prop="name"></el-table-column>
         <el-table-column label="计量单位" prop="measname"></el-table-column>
-        <el-table-column label="规格型号" prop="spec"></el-table-column>
-        <el-table-column label="注册/备案号" prop="registerNo"></el-table-column>
+        <el-table-column label="制剂规格" prop="spec"></el-table-column>
+        <el-table-column label="批准文号" prop="registerNo"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory"></el-table-column>
         <el-table-column label="配送企业" prop="supName"></el-table-column>
         <el-table-column label="操作" width="60">

src/views/basic/workplace/addBusTypeDialog.vue

@@ -74,16 +74,16 @@
 
       </el-row>
       <el-row :gutter="24" class="el-row">
-        <el-col :span="12" class="el-col">
-          <el-form-item label="作业类型:" prop="workplaceType" class="query-form-item">
-            <el-select v-model="formData.workplaceType" style="width: 80%" placeholder="作业类型">
-              <el-option label="全部" :value="3"></el-option>
-              <el-option label="拆零" :value="1"></el-option>
-              <el-option label="取整" :value="2"></el-option>
+        <!--<el-col :span="12" class="el-col">-->
+        <!--  <el-form-item label="作业类型:" prop="workplaceType" class="query-form-item">-->
+        <!--    <el-select v-model="formData.workplaceType" style="width: 80%" placeholder="作业类型">-->
+        <!--      <el-option label="全部" :value="3"></el-option>-->
+        <!--      <el-option label="拆零" :value="1"></el-option>-->
+        <!--      <el-option label="取整" :value="2"></el-option>-->
 
-            </el-select>
-          </el-form-item>
-        </el-col>
+        <!--    </el-select>-->
+        <!--  </el-form-item>-->
+        <!--</el-col>-->
         <el-col :span="12" class="el-col">
           <el-form-item label="扫码方式:" prop="scanType" class="query-form-item">
             <el-select v-model="formData.scanType" style="width: 80%" placeholder="选择扫码方式"
@@ -95,10 +95,6 @@
             </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="checkInsert" class="query-form-item">
             <el-select v-model="formData.checkInsert" style="width: 80%" placeholder="选择扫码方式"
@@ -110,6 +106,11 @@
             </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: 80%" placeholder="选择扫码方式">
@@ -119,9 +120,6 @@
             </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="invCode" class="query-form-item">
             <el-select v-model="formData.invCode" placeholder="请选择仓库"
@@ -139,6 +137,10 @@
             </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="corpType" class="query-form-item">
             <el-select v-model="formData.corpType" style="width: 80%" placeholder="选择往来单位类型"
@@ -152,6 +154,14 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="往来类型标题:" prop="unitTittle" class="query-form-item">
+            <el-input
+              v-model="formData.unitTittle" style="width: 80%"
+              auto-complete="off"
+            ></el-input>
+          </el-form-item>
+        </el-col>
 
       </el-row>
 
@@ -164,14 +174,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12" class="el-col">
-          <el-form-item label="往来类型标题:" prop="unitTittle" class="query-form-item">
-            <el-input
-              v-model="formData.unitTittle" style="width: 80%"
-              auto-complete="off"
-            ></el-input>
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row :gutter="24" class="el-row">
         <el-col class="el-col">