订单审核页面优化，商品新增修改编码校验

src/views/hisStore/components/productAfterSalesOrder.vue

@@ -110,6 +110,7 @@
         </div>
         <el-table
           border
+          v-if="items!=null"
           :data="items"
           size="small"
           style="width: 100%;margin-top: 20px" >
@@ -118,30 +119,69 @@
               <img :src="JSON.parse(scope.row.jsonInfo).image" style="height: 80px">
             </template>
           </el-table-column>
+          <el-table-column label="商品编码" width="300" align="center">
+            <template slot-scope="scope">
+              <p>{{JSON.parse(scope.row.jsonInfo).barCode}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column label="商品组合编码" width="300" align="center">
+            <template slot-scope="scope">
+              <p>{{JSON.parse(scope.row.jsonInfo).groupBarCode}}</p>
+            </template>
+          </el-table-column>
           <el-table-column label="商品名称" width="300" align="center">
             <template slot-scope="scope">
               <p>{{JSON.parse(scope.row.jsonInfo).productName}}</p>
             </template>
           </el-table-column>
-          <el-table-column label="价格" width="240" align="center">
+          <el-table-column label="单价" width="240" align="center">
             <template slot-scope="scope">
-              <p>价格：￥{{JSON.parse(scope.row.jsonInfo).price}}</p>
-
+              <p>￥{{JSON.parse(scope.row.jsonInfo).price.toFixed(2)}}</p>
             </template>
           </el-table-column>
-          <el-table-column label="属性" width="240" align="center">
+          <el-table-column label="规格" width="240" align="center">
             <template slot-scope="scope">
               {{JSON.parse(scope.row.jsonInfo).sku}}
             </template>
           </el-table-column>
           <el-table-column label="数量" width="180" align="center">
             <template slot-scope="scope">
-                {{scope.row.num}}
+              {{scope.row.num}}
             </template>
           </el-table-column>
-          <el-table-column label="小计"  align="center">
+          <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">
+              {{scope.row.batchNumber}}
+            </template>
+          </el-table-column>
+          <el-table-column label="注册证书编号" width="180" align="center">
+            <template slot-scope="scope">
+              {{scope.row.drugRegCertNo}}
+            </template>
+          </el-table-column>
+          <el-table-column label="上市许可持有人" width="180" align="center">
             <template slot-scope="scope">
-              ￥{{scope.row.num*JSON.parse(scope.row.jsonInfo).price}}
+              {{scope.row.mah}}
+            </template>
+          </el-table-column>
+          <el-table-column label="处方药" width="240" align="center">
+            <template slot-scope="scope">
+              {{scope.row.isPrescribe!=null&&scope.row.isPrescribe==1?'是':'否'}}
+            </template>
+          </el-table-column>
+          <el-table-column label="小计"  align="center">
+            <template slot-scope="scope" >
+              ￥{{scope.row.num*JSON.parse(scope.row.jsonInfo).price.toFixed(2)}}
             </template>
           </el-table-column>
         </el-table>

src/views/hisStore/storeProduct/index.vue

@@ -1666,6 +1666,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          let checkBoolean=false;
           if(this.form.specType ===0 ){
             this.form.items = [];
             this.form.values = this.oneFormValidate;
@@ -1673,6 +1674,17 @@ export default {
             this.form.items = this.attrs;
             this.form.values = this.manyFormValidate;
           }
+
+          //验证是否填写商品编码
+          this.form.values.forEach(item => {
+            if(item.barCode == null || item.barCode === ''){
+              return checkBoolean = true;
+            }
+          })
+          if(checkBoolean){
+            return this.$message.warning("规格，商品编码不能为空！");
+          }
+
           if(this.form.specType === 1 && this.manyFormValidate.length===0){
             return this.$message.warning('请点击生成规格！');
           }

src/views/user/complaint/index.vue

@@ -73,17 +73,17 @@
       </el-table-column>
       <el-table-column label="投诉时间" align="center" prop="createTime" />
       <el-table-column
-        label="店铺消息是否处理"
+        label="平台消息是否处理"
         align="center"
         prop="isHandlePlatform"
         :render-header="renderHandleHeader"
       >
         <template slot-scope="scope">
           <el-tag
-            :type="(scope.row.isHandleStore === 1)? 'success' : 'warning'"
+            :type="(scope.row.isReadPlatform === 0)? 'success' : 'warning'"
             disable-transitions
           >
-            {{ formatHandleStatus(scope.row.isHandleStore) }}
+            {{ formatHandleStatus(scope.row.isReadPlatform) }}
           </el-tag>
         </template>
       </el-table-column>
@@ -505,7 +505,7 @@ export default {
       return String(urls).split(",");
     },
     formatHandleStatus(status) {
-      return status === 1 ? '已回复' : '未回复';
+      return status === 0 ? '已回复' : '未回复';
     },
     formatHandleProcessCompleted(processCompleted) {
       return processCompleted === 1 ? '已完成' : '处理中';