Merge branch 'dev_info' of https://git.agilestar.cn/spfm-group/spfm-market-front into dev_info

src/pages/main/performance/components/table.vue

@@ -2,7 +2,7 @@
  * @Author       : yuanrunwei
  * @Date         : 2021-11-01 18:02:58
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2022-01-18 11:23:16
+ * @LastEditTime: 2022-01-18 14:47:12
  * @FilePath     : /spfm-market-front/src/pages/main/performance/components/table.vue
 -->
 <template>
@@ -20,7 +20,7 @@
     />
     <el-table-column
       v-for="(
-        { props, label, type, width, align, children, dictionary, variable },
+        { props, label, type, width, align, children, dictionary, control },
         index
       ) in config"
       :key="index"
@@ -53,11 +53,22 @@
         </div>
         <div v-else-if="type === 'click'">
           <div
-            class="simple-table-click cursor-pointer flex"
+            v-if="control && Number(scope.row[control]) < 1"
+            class="simple-table-click cursor-pointer"
             @click="handleClick(props, scope.row)"
           >
             {{ scope.row[props] }}
           </div>
+          <div
+            v-else-if="!control"
+            class="simple-table-click cursor-pointer"
+            @click="handleClick(props, scope.row)"
+          >
+            {{ scope.row[props] }}
+          </div>
+          <div v-else class="cursor-pointer">
+            {{ scope.row[props] }}
+          </div>
         </div>
         <div v-else-if="type === 'dictionary'">
           {{ dictionary[scope.row[props]] }}
@@ -67,8 +78,8 @@
             <div
               v-for="({ fileName }, index) in scope.row[props]"
               :key="index"
-              @click="downloadFile({index,rows:scope.row})"
-               class="simple-table-click cursor-pointer margin-left-10"
+              @click="downloadFile({ index, rows: scope.row })"
+              class="simple-table-click cursor-pointer margin-left-10"
             >
               {{ fileName }}
             </div>
@@ -97,9 +108,9 @@
             </div>
             <div v-else>{{ scope.row[props] }}</div>
           </template>
-          <template v-if="variable">
+          <!-- <template v-if="variable">
             <div>{{ scope.row[props] }}</div>
-          </template>
+          </template> -->
         </el-table-column>
       </template>
     </el-table-column>

src/pages/main/performance/department.vue

@@ -474,9 +474,10 @@ export default {
           props: "loginNameStr",
         },
         {
-          label: "接受人",
+          label: "接收人",
           props: "receiverName",
           type: "click",
+          control: "viewFlag",
         },
         {
           label: "状态",
@@ -487,15 +488,15 @@ export default {
       ],
     };
   },
-  watch: {
-    duty() {
-      if (this.duty === "9") {
-        this.table_config = this.table_config.filter(
-          (el) => el.props !== "receiverName"
-        );
-      }
-    },
-  },
+  // watch: {
+  //   duty() {
+  //     if (this.duty === "9") {
+  //       this.table_config = this.table_config.filter(
+  //         (el) => el.props !== "receiverName"
+  //       );
+  //     }
+  //   },
+  // },
   mounted() {
     this.handleInit({
       ...this.table_search,

src/pages/main/performance/mould.vue

@@ -61,7 +61,11 @@
             trigger: 'change',
           }"
         >
-          <el-date-picker v-model="issue_form.endTime" type="datetime" format="yyyy-MM-dd HH:00:00">
+          <el-date-picker
+            v-model="issue_form.endTime"
+            type="datetime"
+            format="yyyy-MM-dd HH:00:00"
+          >
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -140,6 +144,9 @@ export default {
         {
           label: "下发",
           props: "issue",
+          visible: {
+            issuedFlag: [0],
+          },
         },
         {
           label: "查看",
@@ -255,7 +262,10 @@ export default {
             },
             data: {
               ...this.issue_form,
-              endTime: this.$formatDate(this.issue_form.endTime, "YYYY-MM-DD HH:00:00"),
+              endTime: this.$formatDate(
+                this.issue_form.endTime,
+                "YYYY-MM-DD HH:00:00"
+              ),
               templateId: this.issue_id,
             },
           }).then(() => {