admin前端bug提交 8.21 zyp

src/api/store/storeOrder.js

@@ -11,7 +11,7 @@ export function listStoreOrder(query) {
 // 查询推广订单列表
 export function listPromotionOrder(query) {
   return request({
-    url: '/store/storeOrder/Plist',
+    url: '/store/storeOrder/promotionList',
     method: 'get',
     params: query
   })
@@ -24,6 +24,7 @@ export function listHealthStoreOrder(query) {
     params: query
   })
 }
+
 export function getCustomerOrderList(query) {
   return request({
     url: '/store/storeOrder/getCustomerOrderList',
@@ -105,6 +106,15 @@ export function exportHealthStoreOrder(query) {
   })
 }
 
+// 导出订单
+export function exportPromotionOrder(query) {
+  return request({
+    url: '/store/storeOrder/promotionExport',
+    method: 'get',
+    params: query
+  })
+}
+
 // 导出付尾款订单
 export function exportStorePayRemainOrder(query) {
   return request({

src/views/company/statistics/smsLogs.vue

@@ -206,6 +206,7 @@ export default {
               data={type:this.value,deptId:this.deptId}
           }
           smsLogs(data).then((response) => {
+           this.list=response.list;
            this.dates=response.dates;
            this.smsCount=response.smsCount;
            this.successCount=response.successCount;

src/views/crm/components/assignCompany.vue

@@ -54,7 +54,7 @@
 
 
     </div>
-</template>>
+</template>
 
 
 <script>
@@ -78,14 +78,14 @@
                 },
                 // 表单校验
                 assignRules: {
-                    
+
                 },
                 companys:[],
-                 
+
             };
         },
         created() {
-          
+
         },
         methods: {
             init(customerIds){
@@ -102,7 +102,7 @@
                          row.count=0;
                          this.computeCount();
                     });
-                   
+
                 }
             },
             handleRemoveCompany(index){
@@ -210,7 +210,7 @@
     height: 100%;
     background-color: #fff;
     padding: 20px;
-        
+
 }
 .footer{
     display: flex;

src/views/store/components/productOrder.vue

@@ -315,11 +315,12 @@
                     />
             </el-select>
         </el-form-item>
-        <el-form-item label="状态" prop="status" v-if="order.status >=1">
+       <el-form-item label="状态" prop="status" v-if="order.status >=1">
            <el-select style="width:220px" v-model="editForm.status" placeholder="请选择状态" clearable size="small">
-              <el-option key="2"  label="待收货" value="2" />
-            </el-select>
-          </el-form-item>
+            <el-option key="1"  label="待发货" value="1" />
+             <el-option key="2"  label="待收货" value="2" />
+           </el-select>
+         </el-form-item>
         <el-form-item label="备注" prop="mark"  >
           <el-input v-model="editForm.mark" placeholder="请输入备注" />
         </el-form-item>

src/views/store/storeOrder/promotionList.vue

@@ -140,7 +140,7 @@
           icon="el-icon-download"
           size="mini"
             @click="handleExport"
-          v-hasPermi="['store:storeOrder:export']"
+          v-hasPermi="['store:promotionOrder:export']"
         >导出订单</el-button>
       </el-col>
         <el-col :span="1.5">
@@ -414,7 +414,7 @@
 </template>
 
 <script>
-import { importTemplate,exportStoreOrderItems,createUserOrder,listPromotionOrder, getStoreOrder, delStoreOrder, addStoreOrder, updateStoreOrder, exportStoreOrder } from "@/api/store/storeOrder";
+import { importTemplate,exportStoreOrderItems,createUserOrder,listPromotionOrder, getStoreOrder, delStoreOrder, addStoreOrder, updateStoreOrder, exportPromotionOrder } from "@/api/store/storeOrder";
 import { getUserList } from "@/api/store/user";
 import { getAddressList } from "@/api/store/userAddress";
 import productOrder from "../components/productOrder";
@@ -854,7 +854,7 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
-          return exportStoreOrder(queryParams);
+          return exportPromotionOrder(queryParams);
         }).then(response => {
           this.download(response.msg);
         }).catch(function() {});

src/views/store/storeProduct/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
- 
+
       <el-form-item label="商品分类" prop="cateId">
          <treeselect  v-model="queryParams.cateId"  style="width:205.4px" :options="categoryOptions" :normalizer="normalizer" placeholder="请选择分类" />
       </el-form-item>
@@ -93,7 +93,7 @@
           v-hasPermi="['store:storePayment:export']"
         >导出</el-button>
       </el-col>
-      
+
 	    <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -159,7 +159,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -195,7 +195,7 @@
               <el-input v-model="form.unitName" placeholder="请输入单位名" />
             </el-form-item>
           </el-col>
-          
+
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -310,7 +310,7 @@
                     <el-input type="text" v-model="scope.row.price"/>
                   </template>
                 </el-table-column>
-                <el-table-column prop="price" label="代理价" align="center">
+                <el-table-column prop="agentPrice" label="代理价" align="center">
                   <template slot-scope="scope">
                     <el-input type="text" v-model="scope.row.agentPrice"/>
                   </template>
@@ -440,7 +440,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            
+
             <el-form-item label="排序" prop="sort">
                <el-input-number :min="0"  v-model="form.sort" placeholder="请输入排序" />
             </el-form-item>
@@ -450,7 +450,7 @@
                <el-input-number :min="0"  v-model="form.sales" placeholder="请输入销量" />
             </el-form-item>
           </el-col>
-      
+
         </el-row>
         <el-form-item label="推广分类" prop="tuiCateId">
           <el-select style="width: 240px" v-model="form.tuiCateId" placeholder="请选择推广分类" clearable size="small" >
@@ -589,7 +589,7 @@ export default {
         productType: null,
         isShow: "1",
         barCode:null,
-       
+
       },
       // 表单参数
       form: {},
@@ -632,7 +632,7 @@ export default {
           { required: true, message: "处方药不能为空", trigger: "blur" }
         ],
 
-        
+
       }
     };
   },
@@ -703,7 +703,7 @@ export default {
             //   }
             // });
         }
-        
+
       }).catch(res => {
       })
     },
@@ -772,7 +772,7 @@ export default {
       that.ruleList.forEach(function (item, index) {
         if (item.ruleName === that.form.selectRule) {
           that.attrs =JSON.parse( item.ruleValue);
-          
+
         }
       });
 
@@ -901,13 +901,13 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-     
+
       this.open = true;
       this.title = "添加商品";
       setTimeout(() => {
         this.$refs.myeditor.setText("");
       }, 500);
-     
+
     },
     /** 修改按钮操作 */
     handleUpdate(row) {