需求更新

src/components/class/index.vue

@@ -296,8 +296,9 @@
           goods_type:'1,2'
         };
         getGoodsListApi(json).then(res=>{
+          console.log(res)
           res.list.forEach(i=>{
-            i.name = '[' + GOODSTYPE[i.goods_type] + ']' + '[' +i.current_price / 100 + '元]' + i.name
+            i.name = '['+i.id+']'+'[' + GOODSTYPE[i.goods_type] + ']' + '[' +i.current_price / 100 + '元]' + i.name
             i.children = [];
           });
           this.goodsList = res.list;

src/components/marketStatistics/index.vue

@@ -31,8 +31,9 @@
           目标差距：{{scope.row.target_diff < 0 ? '超标'+scope.row.target_diff * -1  :scope.row.target_diff}}个
           <br>
           完成率：<el-progress
-          style="display: inline-block;width: calc(90% - 50px)" :text-inside="true" :stroke-width="16" status="success" :percentage="scope.row.complete_rate*1000/10"></el-progress>
+          style="display: inline-block;width: calc(90% - 50px)" :text-inside="true" :stroke-width="16" :status="scope.row.complete_rate>=1?'exception':'success'" :percentage="scope.row.complete_rate*1000/10"></el-progress>
         </template>
+        <!-- exception -->
       </el-table-column>
       <el-table-column
         prop="class_name"

src/components/monthOrder/index.vue

@@ -765,7 +765,7 @@
         return val = val / 100 + '元'
       },
       filterGoods(val){
-          return '[' + GOODSTYPE[val.goods_type] + ']' + '[' +val.current_price / 100 + '元]' + val.name
+          return '[' +val.id + ']' + '[' + GOODSTYPE[val.goods_type] + ']' + '[' +val.current_price / 100 + '元]' + val.name
       },
        buyTypeWay(value){
         return BUYTYPEWAY[value]

src/components/order/index.vue

@@ -414,6 +414,7 @@ export default {
         page: 1,
         limit: 100,
         course_type:1,
+        status:"1,2"
       };
 
       getGoodsListApi(json).then(res => {
@@ -696,6 +697,9 @@ export default {
     },
     filterGoods(val) {
       return (
+        "[" +
+        val.id +
+        "]" +
         "[" +
         GOODSTYPE[val.goods_type] +
         "]" +

src/components/shop/index.vue

@@ -4,6 +4,9 @@
           <el-form-item label="商品名称">
             <el-input v-model="searchFrom.name"></el-input>
           </el-form-item>
+          <el-form-item label="商品编号">
+            <el-input v-model="searchFrom.goods_id"></el-input>
+          </el-form-item>
           <el-form-item label="商品类型">
             <el-select v-model="searchFrom.goods_type" style="width: 120px" placeholder="请选择" @change="getUser">
               <el-option value="" label="请选择"></el-option>
@@ -229,6 +232,7 @@
           status: '1',
           course_id: '',
           course_type:"",
+          goods_id:""
         },
         classType:[
           {
@@ -367,13 +371,18 @@
         if (this.searchFrom.course_id) {
           json.course_id = this.searchFrom.course_id
         }
+        if (this.searchFrom.goods_id) {
+          json.goods_id = this.searchFrom.goods_id
+        }
         if (this.searchFrom.status && this.searchFrom.status !== '-1') {
           json.status = this.searchFrom.status
         }
         if (this.searchFrom.current_price) {
           json.current_price = this.searchFrom.current_price * 100
         }
+        if (this.searchFrom.course_type) {
           json.course_type = this.searchFrom.course_type
+        }
         getGoodsListApi(json).then(res=>{
           res.list.forEach(i=>{
             if(i.conflict_goods_ids === ''){