Merge branch 'online' of http://git.dayaedu.com/molingzhide/dy-admin-manager into online

src/views/businessManager/orderManager/businessStatement.vue

@@ -4,7 +4,7 @@
       <div class="squrt"></div>经营报表
     </h2>
     <div class="m-core">
-        <el-button @click="downloadFile" class="btn-primary">导出</el-button>
+        <el-button @click="downloadFile" v-permission="'operatingReport/export'" class="btn-primary">导出</el-button>
       <!-- 搜索类型 -->
       <el-form :inline="true"
                class="searchForm"

src/views/businessManager/orderManager/payRecord.vue

@@ -5,6 +5,7 @@
     </h2>
     <div class="m-core">
       <el-upload
+        v-permission="'import/downloadTemplate'"
         style="display: inline-block;"
         action="/api-web/import/financialExpenditure"
         :show-file-list="false"
@@ -15,7 +16,7 @@
         :on-success="handleSuccess">
         <el-button class="btn-primary">导入</el-button>
       </el-upload>
-      <el-button @click="downloadFile" class="btn-primary">模版文件下载</el-button>
+      <el-button @click="downloadFile" v-permission="'import/downloadTemplate'" class="btn-primary">模版文件下载</el-button>
       <!-- 搜索类型 -->
       <el-form :inline="true"
                class="searchForm"
@@ -68,7 +69,7 @@
       <!-- 列表 -->
       <el-row>
         <el-col :span="24">
-          <el-button type="primary" size="medium" icon="el-icon-delete" style="background-color: #14928a; border: 1px solid #14928a; margin-bottom: 15px;" @click="onBatchDel">批量删除</el-button>
+          <el-button type="primary" v-permission="'financialExpenditure/batchDel/901'" size="medium" icon="el-icon-delete" style="background-color: #14928a; border: 1px solid #14928a; margin-bottom: 15px;" @click="onBatchDel">批量删除</el-button>
         </el-col>
       </el-row>
       <div class="tableWrap">
@@ -98,6 +99,7 @@
               <el-popconfirm
                 title="确定删除该条数据吗？"
                 @onConfirm="() => removeRecord(scope.row.id)"
+                v-permission="'financialExpenditure/batchDel/902'"
               >
                 <el-button type="text" slot="reference">删除</el-button>
               </el-popconfirm>

src/views/businessManager/orderManager/salesList.vue

@@ -76,7 +76,7 @@
           <el-table-column align='center' prop="schoolName" label="所属学校"></el-table-column>
           <el-table-column align='center' fixed="right" label="操作">
             <template slot-scope="scope">
-              <el-button @click="onBackMoney(scope.row)"  v-permission="'vipGroupManage/applyRefundAudit'" type="text">修改成本</el-button>
+              <el-button @click="onBackMoney(scope.row)"  v-permission="'sellOrder/update'" type="text">修改成本</el-button>
             </template>
           </el-table-column>
         </el-table>

src/views/contentManager/contentOperation.vue

@@ -33,7 +33,7 @@
           <el-input v-model="form.memo"></el-input>
         </el-form-item>
         <!--  -->
-        <el-form-item v-if="type == 3 || type == 6"
+        <el-form-item v-if="type == 3 || type == 6 || type == 5"
                       label="链接地址">
           <el-input v-model.trim="form.linkUrl"></el-input>
         </el-form-item>

src/views/repairManager/repairList.vue

@@ -147,56 +147,82 @@
                :close-on-click-modal="false"
                :visible.sync="repairVisible"
                width="600px">
-      <el-form :model="visibleForm">
-        <el-form-item label="维修单号:">
-          <p v-if="activeRow"
-             class="visibleCell">{{activeRow.transNo}}</p>
-        </el-form-item>
-        <el-form-item label="乐器编号:">
-          <p v-if="activeRow"
-             class="visibleCell">{{activeRow.instrumentNo}}</p>
-        </el-form-item>
-        <el-form-item label="学生姓名:">
-          <p v-if="activeRow"
-             class="visibleCell">{{activeRow.studentName}}</p>
-        </el-form-item>
-        <el-form-item label="归属乐团:">
-          <p v-if="activeRow"
-             class="visibleCell">{{activeRow.studentSchool}}</p>
-        </el-form-item>
-        <el-form-item label="联系人:">
-          <p v-if="activeRow"
-             class="visibleCell">{{activeRow.contactName}}</p>
-        </el-form-item>
-        <el-form-item label="联系方式:">
-          <p v-if="activeRow"
-             class="visibleCell">{{activeRow.contactMobile}}</p>
-        </el-form-item>
-        <el-form-item label="邮寄地址:">
-          <p v-if="activeRow"
-             class="visibleCell">{{activeRow.address}}</p>
-        </el-form-item>
-        <el-form-item label="取件方式:">
-          <p v-if="activeRow"
-             class="visibleCell">{{activeRow.sendType=='0'?'自取':'邮寄'}}</p>
-        </el-form-item>
-        <el-form-item label="问题描述及解决方案:"
-                      style="margin-bottom:5px;">
-
-        </el-form-item>
-        <el-input type='textarea'
+      <el-form :model="visibleForm" :inline="true">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="维修单号:">
+              <p v-if="activeRow"
+                class="visibleCell">{{activeRow.transNo}}</p>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="乐器编号:">
+              <p v-if="activeRow"
+                class="visibleCell">{{activeRow.instrumentNo}}</p>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="学生姓名:">
+              <p v-if="activeRow"
+                class="visibleCell">{{activeRow.studentName}}</p>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="归属乐团:">
+              <p v-if="activeRow"
+                class="visibleCell">{{activeRow.studentSchool}}</p>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="联系人:">
+              <p v-if="activeRow"
+                class="visibleCell">{{activeRow.contactName}}</p>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系方式:">
+              <p v-if="activeRow"
+                class="visibleCell">{{activeRow.contactMobile}}</p>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="邮寄地址:">
+              <p v-if="activeRow"
+                class="visibleCell">{{activeRow.address}}</p>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="取件方式:">
+              <p v-if="activeRow"
+                class="visibleCell">{{activeRow.sendType=='0'?'自取':'邮寄'}}</p>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="问题描述及解决方案:" style="width: 100%">
+          <el-input type='textarea'
                   v-if="activeRow"
+                  style="width: 400px"
                   :rows="3"
                   v-model="activeRow.description"
                   :disabled="activeRow&&Boolean(activeRow.finishTime)"></el-input>
-        <el-form-item label="收费组成:"
-                      style="margin-bottom:5px;">
+        </el-form-item>
+        <el-form-item label="收费组成:">
           <el-input type='textarea'
                     v-if="activeRow"
+                    style="width: 470px"
                     :rows="3"
                     v-model="activeRow.feeList"
                     :disabled="true"></el-input>
-
+        </el-form-item>
+        <el-form-item label="商品列表:">
+          <p v-if="activeRow"
+            class="visibleCell">{{activeRow.contactName}}</p>
         </el-form-item>
       </el-form>
       <span slot="footer"
@@ -331,7 +357,10 @@ export default {
       this.getList()
     },
     showDetail (row) {
+      let goodsList = row.goodsJson ? JSON.parse(row.goodsJson) : []
+      row.goodsJson = goodsList
       this.activeRow = row;
+      console.log(row)
       this.repairVisible = true;
     },
     repairEnd (str, row) {