Merge branch 'feature/v1/plb' into 'master'

修改代办买药

See merge request !9

src/views/orderManagement/dbmyOrder/index.vue

@@ -105,14 +105,32 @@
         prop="ypName"
         prop="ypName"
         key="ypName"
         key="ypName"
         :show-overflow-tooltip="true"
         :show-overflow-tooltip="true"
-      />
+      >
+        <template slot-scope="{ row }">
+          <el-button
+            v-if="row.ypName"
+            type="text"
+            @click="clickSeeROWrFK(row.ypName, '药品名称')"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
       <el-table-column
       <el-table-column
         label="药店地址"
         label="药店地址"
         align="center"
         align="center"
         prop="ydAddress"
         prop="ydAddress"
         key="ydAddress"
         key="ydAddress"
         :show-overflow-tooltip="true"
         :show-overflow-tooltip="true"
-      />
+      >
+        <template slot-scope="{ row }">
+          <el-button
+            v-if="row.ydAddress"
+            type="text"
+            @click="clickSeeROWrFK(row.ydAddress, '药店地址')"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
       <el-table-column
       <el-table-column
         label="是否处方药"
         label="是否处方药"
         align="center"
         align="center"
@@ -134,7 +152,7 @@
         :show-overflow-tooltip="true"
         :show-overflow-tooltip="true"
         width="120"
         width="120"
       >
       >
-        <template slot-scope="{ row }">
+        <!-- <template slot-scope="{ row }">
           <fileUpload
           <fileUpload
             v-model="row.prescriptionAttachment"
             v-model="row.prescriptionAttachment"
             :isShowTip="false"
             :isShowTip="false"
@@ -147,6 +165,20 @@
                 : 1
                 : 1
             "
             "
           />
           />
+        </template> -->
+        <template slot-scope="{ row }">
+          <el-button
+            v-if="row.prescriptionAttachment"
+            type="text"
+            @click="
+              clickSeeROWrFK(
+                row.prescriptionAttachment,
+                '处方附件',
+                'fileUpload'
+              )
+            "
+            >查看</el-button
+          >
         </template>
         </template>
       </el-table-column>
       </el-table-column>
       <el-table-column label="取药方式" align="center" prop="way" key="way">
       <el-table-column label="取药方式" align="center" prop="way" key="way">
@@ -161,14 +193,32 @@
         prop="recipient"
         prop="recipient"
         key="recipient"
         key="recipient"
         :show-overflow-tooltip="true"
         :show-overflow-tooltip="true"
-      />
+      >
+        <template slot-scope="{ row }">
+          <el-button
+            v-if="row.recipient"
+            type="text"
+            @click="clickSeeROWrFK(row.recipient, '收件人')"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
       <el-table-column
       <el-table-column
         label="收货地址"
         label="收货地址"
         align="center"
         align="center"
         prop="adress"
         prop="adress"
         key="adress"
         key="adress"
         :show-overflow-tooltip="true"
         :show-overflow-tooltip="true"
-      />
+      >
+        <template slot-scope="{ row }">
+          <el-button
+            v-if="row.adress"
+            type="text"
+            @click="clickSeeROWrFK(row.adress, '收货地址')"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
       <el-table-column
       <el-table-column
         label="城市"
         label="城市"
         align="center"
         align="center"
@@ -182,7 +232,16 @@
         prop="addressInfo"
         prop="addressInfo"
         key="addressInfo"
         key="addressInfo"
         :show-overflow-tooltip="true"
         :show-overflow-tooltip="true"
-      />
+      >
+        <template slot-scope="{ row }">
+          <el-button
+            v-if="row.addressInfo"
+            type="text"
+            @click="clickSeeROWrFK(row.addressInfo, '详细地址')"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
       <el-table-column label="接单人" align="center" prop="ename" key="ename">
       <el-table-column label="接单人" align="center" prop="ename" key="ename">
         <template slot-scope="{ row }">
         <template slot-scope="{ row }">
           <el-button v-if="row.ename" type="text" @click="clickSeeEM(row)"
           <el-button v-if="row.ename" type="text" @click="clickSeeEM(row)"
@@ -535,6 +594,36 @@
         </div>
         </div>
       </el-dialog>
       </el-dialog>
     </template>
     </template>
+
+    <template v-if="vDataL.open">
+      <el-dialog
+        :title="vDataL.title"
+        :visible.sync="vDataL.open"
+        width="600px"
+        append-to-body
+      >
+        <div class="contl">
+          <div class="contl-item">
+            <p class="contl-item-label">{{ vDataL.title }}：</p>
+            <template v-if="vDataL.type === 'fileUpload'">
+              <fileUpload
+                v-model="vDataL.value"
+                :isShowTip="false"
+                :disabled="true"
+                :limit="
+                  vDataL.value &&
+                  vDataL.value.split(',') &&
+                  vDataL.value.split(',').length
+                    ? vDataL.value.split(',').length
+                    : 1
+                "
+              />
+            </template>
+            <p class="contl-item-rig" v-else>{{ vDataL.value }}</p>
+          </div>
+        </div>
+      </el-dialog>
+    </template>
   </div>
   </div>
 </template>
 </template>
 
 
@@ -551,6 +640,12 @@ export default {
   name: "DbmyOrder",
   name: "DbmyOrder",
   data() {
   data() {
     return {
     return {
+      vDataL: {
+        open: false,
+        title: "",
+        value: "",
+        type: "",
+      },
       openEMInfo: false,
       openEMInfo: false,
       openArticleInfoImg: false,
       openArticleInfoImg: false,
       openArticleInfo: false,
       openArticleInfo: false,
@@ -618,6 +713,18 @@ export default {
     this.getList();
     this.getList();
   },
   },
   methods: {
   methods: {
+    clickSeeROWrFK(value, title, type = "undefined") {
+      this.vDataL = {
+        open: false,
+        title: "",
+        value: "",
+        type: "",
+      };
+      this.$set(this.vDataL, "title", title);
+      this.$set(this.vDataL, "value", value);
+      this.$set(this.vDataL, "type", type);
+      this.$set(this.vDataL, "open", true);
+    },
     clickSeeEM(row) {
     clickSeeEM(row) {
       this.openEMInfo = true;
       this.openEMInfo = true;
       this.VisitorData = row;
       this.VisitorData = row;