医健宝改动

src/api/hisStore/storeOrder.js

@@ -329,3 +329,19 @@ export function importDeliveryNoteExpressTemplate() {
     method: 'get'
   })
 }
+
+export function getCommentInfo(id) {
+  return request({
+    url: '/his/comment/' + id,
+    method: 'get'
+  })
+}
+
+//修改评论
+export function updateCommentInfo(data) {
+  return request({
+    url: '/his/comment',
+    method: 'put',
+    data: data
+  })
+}

src/views/hisStore/components/productOrder.vue

@@ -48,6 +48,9 @@
         </div>
         <div class="operate-button-container" v-if="order.status >=1 && order.extendOrderId == null && order.deliveryId == null"  v-hasPermi="['store:storeOrder:createErpOrder']"  >
           <el-button size="mini" @click="addErpOrder()" >创建ERP订单信息</el-button>
+        </div>
+         <div class="operate-button-container" >
+          <el-button size="mini" @click="replyComment()"  v-hasPermi="['store:storeOrder:editDeliveryId']" >回复用户评价</el-button>
         </div>
         <!-- <div class="operate-button-container" v-show="order.status===2">
           <el-button size="mini"  >去发货</el-button>
@@ -158,6 +161,38 @@
                   {{order.mark}}
                 </span>
             </el-descriptions-item>
+             <el-descriptions-item label="用户评价"  >
+                <span v-if="order!=null">
+                  {{order.commentContent}}
+                </span>
+            </el-descriptions-item>
+             <el-descriptions-item label="评价附图"  >
+                <span v-if="order!=null && order.commentImageUrl != null">
+                   <img :src="order.commentImageUrl" style="height: 80px">
+                  <!-- {{order.commentImageUrl}} -->
+                </span>
+            </el-descriptions-item>
+             <el-descriptions-item label="评价星级"  >
+                <span v-if="order!=null">
+                  <el-rate
+                    v-model="order.rating"
+                    disabled
+                    show-score
+                    text-color="#ff9900"
+                    score-template="{value}">
+                  </el-rate>
+                </span>
+            </el-descriptions-item>
+             <el-descriptions-item label="评价时间"  >
+                <span v-if="order!=null">
+                  {{order.commentTime}}
+                </span>
+            </el-descriptions-item>
+             <el-descriptions-item label="商家回复"  >
+                <span v-if="order!=null">
+                  {{order.merchantReply}}
+                </span>
+            </el-descriptions-item>
       </el-descriptions>
       <div style="margin: 20px 0px"  v-if="order!=null && certificates != null">
         <span class="font-small">
@@ -217,6 +252,16 @@
           <template slot-scope="scope">
             {{scope.row.num}}
           </template>
+        </el-table-column>
+         <el-table-column label="剂型" width="180" align="center">
+          <template slot-scope="scope">
+            {{scope.row.dosageForm}}
+          </template>
+        </el-table-column>
+         <el-table-column label="通用名称" width="180" align="center">
+          <template slot-scope="scope">
+            {{scope.row.commonName}}
+          </template>
         </el-table-column>
          <el-table-column label="批号" width="180" align="center">
           <template slot-scope="scope">
@@ -506,16 +551,52 @@
       </div>
     </el-dialog>
 
+    <el-dialog title="回复评价" :visible.sync="replyCommentOpen" width="600px" append-to-body :close-on-click-modal="false">
+      <el-form ref="replyCommentForm" :model="replyCommentForm" :rules="replyCommentRules" label-width="120px">
+         <el-form-item label="用户评价" prop="content"  >
+          <el-input disabled v-model="replyCommentForm.content" placeholder="请输入用户评价" type="textarea" />
+        </el-form-item>
+         <el-form-item label="评价星级" prop="rating"  >
+          <!-- <el-input  v-model="replyCommentForm.rating" placeholder="请输入评价星级" /> -->
+           <el-rate
+                    v-model="replyCommentForm.rating"
+                    disabled
+                    show-score
+                    text-color="#ff9900"
+                    score-template="{value}">
+            </el-rate>
+        </el-form-item>
+         <el-form-item label="评价附图" prop="imageUrl"  >
+            <img :src="replyCommentForm.imageUrl" style="height: 80px">
+        </el-form-item>
+         <el-form-item label="评价时间" prop="createTime"  >
+          <el-input disabled v-model="replyCommentForm.createTime" placeholder="请输入评价时间" />
+        </el-form-item>
+        <el-form-item label="商家回复" prop="merchantReply"  >
+          <el-input v-model="replyCommentForm.merchantReply" placeholder="请输入商家回复" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitreplyCommentForm">确 定</el-button>
+        <el-button @click="replyCommentOpen = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import {auditPayRemain,addTuiMoney,syncExpress,updateExpress,getEroOrder,refundOrderMoney, editTuiMoney,getExpress,finishOrder,listStoreOrder, getStoreOrder, delStoreOrder, addStoreOrder, updateStoreOrder, exportStoreOrder,updateDeliveryId, createErpOrder,updateErp,getStoreOrderAddress,getStoreOrderPhone} from "@/api/hisStore/storeOrder";
+import {auditPayRemain,addTuiMoney,syncExpress,updateExpress,getEroOrder,refundOrderMoney,
+ editTuiMoney,getExpress,finishOrder,listStoreOrder, getStoreOrder, delStoreOrder, addStoreOrder,
+  updateStoreOrder, exportStoreOrder,updateDeliveryId, createErpOrder,updateErp,getStoreOrderAddress,
+  getStoreOrderPhone,getCommentInfo,updateCommentInfo} from "@/api/hisStore/storeOrder";
 import { getTcmScheduleList } from "@/api/company/schedule";
 export default {
   name: "order",
   data() {
     return {
+      replyCommentForm:{},
+      replyCommentOpen:false,
       dialogVisibleImage: false,
       createTypeOptions:[],
       deliveryStatusOptions:[],
@@ -551,7 +632,11 @@ export default {
         scheduleId:null,
         mark:"",
       },
-
+      replyCommentRules:{
+         merchantReply: [
+          { required: true, message: "商家回复不能为空", trigger: "blur" }
+        ],
+      },
       editDyRules:{
         deliverySn: [
           { required: true, message: "物流公司不能为空", trigger: "blur" }
@@ -703,6 +788,21 @@ export default {
         }
       });
     },
+    submitreplyCommentForm(){
+      let _this = this;
+       this.$refs["replyCommentForm"].validate(valid => {
+        if (valid) {
+          updateCommentInfo(this.replyCommentForm).then(res=>{
+               _this.msgSuccess("操作成功");
+               _this.getOrder(_this.order.id);
+               _this.replyCommentOpen = false;
+          }).catch(res=>{
+            console.log(res);
+            _this.replyCommentOpen = false;
+          });
+        }
+      });
+    },
     submitEditDyForm(){
         this.$refs["editDyForm"].validate(valid => {
         if (valid) {
@@ -851,6 +951,21 @@ export default {
             this.tuiMoneyLogs=response.tuiMoneyLogs;
             this.auditLogs = response.auditLogs;
         });
+     },
+     //回复订单评论
+     replyComment(){
+      let _this = this;
+      if(null == this.order.commentId || undefined == this.order.commentId || '' == this.order.commentId){
+        this.$message.error("订单尚未评价，不能回复");
+        return;
+      }
+      getCommentInfo(this.order.commentId).then(res=>{
+          _this.replyCommentOpen = true;
+          console.log(res.data);
+          _this.replyCommentForm = res.data;
+      })
+      
+
      }
   }
 };

src/views/hisStore/storeProduct/index.vue

@@ -37,7 +37,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="所属公司">
+      <!-- <el-form-item label="所属公司">
         <el-select style="width: 240px" v-model="companyId" multiple placeholder="请选择企业" clearable size="small" >
           <el-option
             v-for="item in companyOptions"
@@ -46,7 +46,7 @@
             :value="item.companyId"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="所属店铺" v-if="medicalMallConfig.isStores">
         <el-select style="width: 240px" v-model="queryParams.storeIds" placeholder="请选择店铺" clearable size="small" >
           <el-option
@@ -202,6 +202,14 @@
           size="small"
 
         />
+      </el-form-item>
+       <el-form-item label="规格" prop="prescribeSpec">
+        <el-input
+          v-model="queryParams.prescribeSpec"
+          placeholder="请输入规格"
+          clearable
+          size="small"
+        />
       </el-form-item>
       </div>
       <!-- <el-form-item label="状态" prop="isShow">
@@ -295,7 +303,7 @@
       </el-table-column>
       <el-table-column label="商品名称" show-overflow-tooltip align="center" prop="productName" />
       <el-table-column label="分类" align="center" prop="cateName" />
-      <el-table-column label="所属公司" align="center" prop="companyName" />
+      <!-- <el-table-column label="所属公司" align="center" prop="companyName" /> -->
       <el-table-column label="所属店铺" align="center" prop="storeName" v-if="medicalMallConfig.isStores"/>
       <el-table-column label="售价" align="center" prop="price" >
         <template slot-scope="scope" >
@@ -367,7 +375,7 @@
             <el-radio :label="item.dictValue" v-for="item in isDisplayOptions" >{{item.dictLabel}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="所属公司" prop="companyId">
+        <!-- <el-form-item label="所属公司" prop="companyId">
           <el-select style="width: 220px" filterable multiple v-model="form1.companyId" placeholder="请选择公司名" clearable size="small">
             <el-option
               v-for="item in companyOptions"
@@ -376,7 +384,7 @@
               :value="item.companyId"
             />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm1">确 定</el-button>
@@ -827,7 +835,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="所属公司">
+        <!-- <el-form-item label="所属公司">
           <el-select style="width: 240px" v-model="form.companyIds" multiple placeholder="请选择企业" clearable size="small" >
             <el-option
               v-for="item in companyOptions"
@@ -836,7 +844,7 @@
               :value="item.companyId"
             />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="所属店铺" prop="storeId" v-if="medicalMallConfig.isStores">
           <el-select style="width: 240px" v-model="form.storeId" placeholder="请选择店铺" clearable size="small" >
             <el-option