戴艳蓉 3 years ago
parent
commit
d01ef8c1cd

+ 2 - 2
src/views/interest/account/index.vue

@@ -129,7 +129,7 @@
           ></el-tag>
         </template>
         <template #operation="{ scope }">
-          <el-tooltip
+          <!-- <el-tooltip
             v-if="powers.some((item) => item == '002')"
             effect="dark"
             content="重置密码"
@@ -139,7 +139,7 @@
               class="el-icon-refresh-left tb-icon"
               @click="openPasswordModal(scope.row.id, false)"
             ></i>
-          </el-tooltip>
+          </el-tooltip> -->
 
           <el-tooltip
             v-if="powers.some((item) => item == '007')"

+ 5 - 2
src/views/purchaseAndSale/adjust/addEdit.vue

@@ -79,6 +79,9 @@
 import asyncRequest from "@/apis/service/purchaseAndSale/adjust";
 import resToken from "@/mixins/resToken";
 import Tinymce from "@/components/Tinymce";
+import {
+ platformType,
+} from "./columns";
 export default {
   name: "adjust",
   props: ["showModel", "id", "isDetail", "sitem"],
@@ -93,7 +96,7 @@ export default {
       showModelThis: this.showModel,
       ruleForm: {
         title: "", // 账号
-        company_type: "1",
+        company_type: platformType,
         model_id: [], // 功能区
         remark: "",
       },
@@ -156,7 +159,7 @@ export default {
 
           this.ruleForm = {
             title: "我是一个标题", // 账号
-            company_type: "1",
+            company_type: platformType,
             model_id: [], // 功能区
             remark: `<h4>【故障现象描述:】</h4>
        <p style="font-size:12px">

+ 6 - 3
src/views/purchaseAndSale/adjust/columns.js

@@ -142,9 +142,10 @@ const columnsDeploy = [
     width: '70px'
   },
   {
-    prop: "apply_name",
+    prop: "company_name",
     label: "申请人部门",
-    width: '100px'
+    _slot_: "company_name",
+    "min-width": '140px'
   },
   {
     prop: "updatetime",
@@ -209,11 +210,13 @@ const columnsDeploy = [
     width: "50",
   },
 ]
+const platformType='1'
 export {
   seachStatus,
   statusOptions,
   levelOptions,
   typeOptions,
   columnsDeploy,
-  recordList
+  recordList,
+  platformType
 };

+ 43 - 13
src/views/purchaseAndSale/adjust/detail.vue

@@ -213,13 +213,31 @@
         </el-form-item>
 
         <el-form-item label="创建人部门:">
-          <div class="show-input">创建人部门</div>
+          <div class="show-input hei">
+            <el-tag
+              style="margin: 0 5px 0 0"
+              type="info"
+              size="mini"
+              v-for="(ditem, dindex) in ruleForm.company_name"
+              :key="ditem + dindex"
+            >
+              <span
+                v-for="(cItem, cindex) in ditem"
+                :key="cItem + dindex + cindex"
+                :style="{ marginLeft: cindex > 0 ? '0px' : '0px' }"
+              >
+                <span v-show="cindex > 0">/</span><span>{{ cItem.name }}</span>
+              </span>
+              <!-- {{ ditem.name }} -->
+            </el-tag>
+          </div>
         </el-form-item>
       </el-form>
     </div>
     <select-handler-model
       :id="queryId"
       :show-model="showModel"
+      :type="platformType"
       @refresh="(showModel = false), getMuser()"
       @cancel="showModel = false"
     />
@@ -227,23 +245,25 @@
 </template>
 <script>
 import asyncRequest from "@/apis/service/purchaseAndSale/adjust";
-
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
 import record from "./record";
 import comModule from "./comModule";
 import Tinymce from "@/components/Tinymce";
 import selectHandlerModel from "./select-handler-model";
-import { statusOptions, levelOptions, typeOptions } from "./columns";
+import {
+  statusOptions,
+  levelOptions,
+  typeOptions,
+  platformType,
+} from "./columns";
 export default {
   name: "adjustDetail",
-  // mixinPage,
   mixins: [resToken],
   components: {
     Tinymce,
     record,
     comModule,
-
     selectHandlerModel,
   },
   computed: {
@@ -267,7 +287,7 @@ export default {
       parmValue: {
         page: 1, // 页码
         size: 5, // 每页显示条数
-        id:this.queryId,
+        id: this.queryId,
       },
       tableData: [],
       pageInfo: {
@@ -396,22 +416,24 @@ export default {
           apply_name,
           model_id,
           deal_id,
+          company_name,
         } = res.data;
         // console.log(res.data);
         this.ruleForm = {
           id: id,
           bugNo: bugNo,
           title: title || "",
-          company_type: company_type || "",
+          company_type: company_type || platformType,
           remark: remark || "",
           status: status || "",
           level: level || "",
           type: type || "",
           apply_name: apply_name || "",
           model_id: model_id.split(",") || [],
-          deal_id:deal_id||""
+          deal_id: deal_id || "",
+          company_name: company_name || [],
         };
-        await  this.getMuser()
+        await this.getMuser();
         this.getNewTime();
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
@@ -427,7 +449,7 @@ export default {
         list.forEach((v) => {
           let model = {
             value: v.manange_id,
-            label: v.name,
+            label: v.manange_name,
           };
           this.userOptions.push(model);
         });
@@ -440,7 +462,7 @@ export default {
     // 刷新表格
     async searchList() {
       this.tableData = [];
-      this.parmValue.id=this.queryId
+      this.parmValue.id = this.queryId;
       const res = await asyncRequest.cloudlist(this.parmValue);
       if (res && res.code === 0 && res.data) {
         let { list, count } = res.data;
@@ -470,13 +492,17 @@ export default {
     InitializeForm() {
       this.ruleForm = {
         id: "",
+        bugNo: "",
         title: "",
+        company_type: "",
         remark: "",
         status: "",
         level: "",
         type: "",
-        manange: "",
-        model: [],
+        apply_name: "",
+        deal_id: "",
+        model_id: [],
+        company_name: [],
       };
     },
     // 保存更改
@@ -721,6 +747,10 @@ export default {
             background: rgb(242, 245, 250);
           }
         }
+        &.hei {
+          height: auto !important;
+          line-height: 28px auto !important;
+        }
       }
       .setUser {
         position: absolute;

+ 18 - 0
src/views/purchaseAndSale/adjust/index.vue

@@ -171,6 +171,24 @@
               ).label || '--'
             "
           ></el-tag>
+        </template>
+             <template #company_name="{ scope }">
+          <el-tag
+            style="margin: 0 5px 0 0"
+            :size="tablebtnSize"
+            type="info"
+            v-for="(ditem, dindex) in scope.row.company_name"
+            :key="ditem + dindex"
+          >
+            <span
+              v-for="(cItem, cindex) in ditem"
+              :key="cItem + dindex + cindex"
+              :style="{'marginLeft':cindex>0?'0px':'0px'}"
+            >
+              <span v-show="cindex > 0">/</span><span>{{ cItem.name }}</span>
+            </span>
+            </el-tag
+          >
         </template>
         <template #level="{ scope }">
           <el-tag

+ 3 - 3
src/views/purchaseAndSale/adjust/select-handler-model/index.vue

@@ -53,7 +53,7 @@ import asyncRequest from "@/apis/service/purchaseAndSale/adjust";
 import resToken from "@/mixins/resToken";
 export default {
   name: "selectHandlerModel",
-  props: ["showModel", "id"],
+  props: ["showModel", "id", "type"],
   mixins: [resToken],
   data() {
     return {
@@ -122,7 +122,7 @@ export default {
     },
     async getMuser() {
       this.checkedValue = [];
-      const res = await asyncRequest.MUser({ manange_name: "1" });
+      const res = await asyncRequest.MUser({ manange_name: this.type });
       if (res && res.code === 0) {
         let list = res.data;
         this.data.forEach((x) => {
@@ -141,7 +141,7 @@ export default {
     async submitForm() {
       this.loading = true;
       let model = {
-        manange_name: "1",
+        manange_name: this.type,
         id: this.checkedValue,
       };
       let res = await asyncRequest.MUpdate(model);