Merge branch 'sit' of daiyanrong/live-telecast-ui-pc into master

debug.log

@@ -0,0 +1 @@
+[0113/134054.157:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event

src/views/mobile/park/index.vue

@@ -140,8 +140,8 @@
           <span>{{ scope.row.starttime }}~{{ scope.row.expiretime }}</span>
         </template>
         <template #operation="{ scope }">
+           <!-- v-if="roles === 'admin'" -->
           <el-tooltip
-            v-if="roles === 'admin'"
             effect="dark"
             content="重置密码"
             placement="top"

src/views/mobile/stock/editRecord.vue

@@ -148,6 +148,7 @@ export default {
     },
     showModelThis(val) {
       if (!val) {
+        console.log('cancel')
         this.$emit("cancel");
       }
     },
@@ -158,6 +159,7 @@ export default {
     },
     async initForm() {
       this.loading = true;
+        this.tableData= [];
       await this.searchList();
       this.loading = false;
     },

src/views/mobile/stock/index.vue

@@ -152,12 +152,12 @@
     </ex-table>
     <no-auth v-else></no-auth>
     <!-- 弹窗 新增/修改 -->
-    <add-edit
+    <!-- <add-edit
       :id="modelId"
       :show-model="showModel"
       @refresh="searchList"
       @cancel="showModel = false"
-    />
+    /> -->
     <!-- 库存修改记录 -->
     <edit-record
       :id="modelId"
@@ -212,6 +212,7 @@ export default {
       input: "",
       loading: true,
       showModel: false,
+      showRecordModel:false,
       modelId: 0,
       parmValue: {
         username: "", // 账户名
@@ -321,11 +322,12 @@ export default {
     // 新建/编辑/详情
     openModal(id, isDetail) {
       this.modelId = id;
-      if (isDetail == true) {
-        this.showModel = true;
-      } else {
-        this.showRecordModel = true;
-      }
+      this.showRecordModel = true;
+      // if (isDetail == true) {
+      //   this.showModel = true;
+      // } else {
+      //   this.showRecordModel = true;
+      // }
     },
 
     async numReturned(e) {
@@ -341,9 +343,8 @@ export default {
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
-        this.tableData.forEach(v1 => {
-          v1.stock_balance+="kg"
-          
+        this.tableData.forEach((v1) => {
+          v1.stock_balance += "kg";
         });
         this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {

src/views/mobile/videos/index.vue

@@ -151,7 +151,7 @@
               @click="selectPop(scope.row.status, scope.row.id)"
             ></i>
           </el-tooltip>
-          <el-tooltip
+          <!-- <el-tooltip
             v-if="powers.some((item) => item == '006')"
             class="item"
             effect="dark"
@@ -163,7 +163,7 @@
               class="tb-icon el-icon-delete-solid"
               @click="deletePop(scope.row.id)"
             ></i>
-          </el-tooltip>
+          </el-tooltip> -->
         </template>
         <template #status="{ scope }">
           <el-tag