12/9 药品详情显示

src/views/index.vue

@@ -212,7 +212,7 @@
             <template slot-scope="scope">
               <el-button
                 type="text"
-                @click="linkPage('/order/checked')"
+                @click="linkPage(scope.row)"
               >处理
               </el-button>
             </template>
@@ -318,8 +318,15 @@ export default {
         this.certMsgCount = res.data
       })
     },
-    linkPage(path) {
+    linkPage(row) {
+      let path = ""
+      if (row.productType == 2){
+        path = "/drug/order/drug/checked"
+      }else {
+        path = "/order/checked"
+      }
       console.log(path)
+
       this.$router.push(path)
     },
     getSysMsgTodoList() {

src/views/inoutDrug/DialogSelectInvProduct.vue

@@ -14,8 +14,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="规格型号:">
-              <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号"></el-input>
+            <el-form-item label="包装规格:">
+              <el-input v-model="filterQuery.bzgg" style="width: 90%" placeholder="请输入包装规格"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -77,7 +77,6 @@
         <el-table-column label="序号" type="index" width="55"></el-table-column>
         <el-table-column label="药品编码" prop="nameCode" width="120" show-overflow-tooltip></el-table-column>
         <el-table-column label="药品名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" width="160"></el-table-column>
         <el-table-column label="包装规格" prop="bzgg" width="100"></el-table-column>
         <el-table-column label="计量单位" prop="measname" width="90"></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="90"></el-table-column>
@@ -87,7 +86,7 @@
         <el-table-column label="入库数量" prop="inCount" width="90"></el-table-column>
         <el-table-column label="出库数量" prop="outCount" width="90"></el-table-column>
         <el-table-column label="结余数量" prop="reCount" width="90"></el-table-column>
-        <el-table-column label="生产企业" prop="ylqxzcrbarmc" width="180"></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" width="180"></el-table-column>
         <el-table-column label="批准文号" prop="zczbhhzbapzbh" width="180"></el-table-column>
         <el-table-column label="供应商" prop="supName" width="180"></el-table-column>
       </el-table>

src/views/pharmaceuticals/purApplyDrug/purUdiRlDetailDialog.vue

@@ -436,11 +436,12 @@ export default {
       if (this.editQuery.uuid != null) {
           this.query.uuid =  this.editQuery.uuid
         //根据 type 的值决定 id 的来源
-        if (this.type == 1) {
+        // if (this.type == 1) {
           this.query.id  = this.editQuery.rlId; // 如果 type 为 1，使用 relId
-        } else {
-          this.query.id = this.editQuery.id; // 否则使用 id
-        }
+        // }
+        // else {
+        //   this.query.id = this.editQuery.id; // 否则使用 id
+        // }
         filterByUuid(this.query)
           .then((response) => {
             this.loading = false