戴艳蓉 3 years ago
parent
commit
b330c0f0d1

+ 18 - 13
src/views/purchaseAndSale/adjust/columns.js

@@ -78,15 +78,17 @@ const levelOptions = [
   {
     value: "1",
     label: "高",
+    type:'danger'
   },
   {
     value: "2",
     label: "中",
+    type:'info'
   },
-
   {
     value: "3",
     label: "低",
+    type:'success'
   },
 ]
 const typeOptions = [
@@ -107,28 +109,26 @@ const columnsDeploy = [
   {
     prop: "bugNo",
     label: "需求编号",
+    width: '160px'
   },
-  {
-    prop: "title",
-    label: "标题",
-  },
+
   {
     prop: "status",
     label: "状态",
     _slot_: "status",
-    width: '150px'
+    width: '70px'
   },
   {
     prop: "level",
     label: "优先级",
     _slot_: "level",
-    width: '80px'
+    width: '60px'
   },
   {
     prop: "type",
     label: "需求类型",
     _slot_: "types",
-    width: '150px'
+    width: '95px'
   },
 
   {
@@ -141,17 +141,22 @@ const columnsDeploy = [
     label: "申请人",
     width: '70px'
   },
+  {
+    prop: "title",
+    label: "标题",
+    'min-width': '160px'
+  },
   {
     prop: "company_name",
     label: "申请人部门",
     _slot_: "company_name",
     "min-width": '140px'
   },
-  {
-    prop: "updatetime",
-    label: "更新时间",
-    width: '140px'
-  },
+  // {
+  //   prop: "updatetime",
+  //   label: "更新时间",
+  //   width: '140px'
+  // },
   {
     prop: "addtime",
     label: "创建时间",

+ 4 - 2
src/views/purchaseAndSale/adjust/detail.vue

@@ -241,7 +241,7 @@
     <select-handler-model
       :id="queryId"
       :show-model="showModel"
-      :type="platformType"
+      :type="type"
       @refresh="(showModel = false), getMuser()"
       @cancel="showModel = false"
     />
@@ -302,12 +302,14 @@ export default {
       statusOptions: statusOptions,
       levelOptions: levelOptions,
       typeOptions: typeOptions,
+      type: platformType,
       userOptions: [],
       ruleForm: {},
       activeName: "1",
       newTime: "",
       showModel: false,
       queryId: "",
+
       loading: false,
       rulesThis: this.rules,
     };
@@ -515,7 +517,7 @@ export default {
         if (valid) {
           this.loading = true;
           let model = JSON.parse(JSON.stringify(this.ruleForm));
-           model.model_id = model.model_id.toString();
+          model.model_id = model.model_id.toString();
           delete model["company_name"];
           delete model["apply_name"];
           let length = 5000;

+ 14 - 8
src/views/purchaseAndSale/adjust/index.vue

@@ -26,7 +26,7 @@
         <template #table-header="{}">
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
-              <el-col :span="5" style="width: 100px;">
+              <el-col :span="5" style="width: 100px">
                 <el-select
                   v-model="parmValue.level"
                   style="width: 100%"
@@ -131,6 +131,7 @@
                     <el-option label="需求编号" value="1" />
                     <el-option label="需求标题" value="2" />
                     <el-option label="申请人" value="3" />
+                    <el-option label="处理人" value="4" />
                   </el-select>
                   <el-button
                     slot="append"
@@ -172,7 +173,7 @@
             "
           ></el-tag>
         </template>
-             <template #company_name="{ scope }">
+        <template #company_name="{ scope }">
           <el-tag
             style="margin: 0 5px 0 0"
             :size="tablebtnSize"
@@ -183,17 +184,19 @@
             <span
               v-for="(cItem, cindex) in ditem"
               :key="cItem + dindex + cindex"
-              :style="{'marginLeft':cindex>0?'0px':'0px'}"
+              :style="{ marginLeft: cindex > 0 ? '0px' : '0px' }"
             >
               <span v-show="cindex > 0">/</span><span>{{ cItem.name }}</span>
             </span>
-            </el-tag
-          >
+          </el-tag>
         </template>
         <template #level="{ scope }">
           <el-tag
             :size="tablebtnSize"
-            :type="scope.row.level == '0' ? 'warning' : ''"
+            :type="
+              (levelOptions.find((item) => item.value == scope.row.level) || {})
+                .type || 'success'
+            "
             v-text="
               (levelOptions.find((item) => item.value == scope.row.level) || {})
                 .label || '--'
@@ -231,7 +234,6 @@
         @refresh="searchList"
         @cancel="showModel = false"
       />
-  
     </div>
     <no-auth v-else></no-auth>
   </div>
@@ -255,7 +257,6 @@ export default {
   mixins: [mixinPage, resToken],
   components: {
     addEdit,
-  
   },
   computed: {
     //组件SIZE设置
@@ -368,6 +369,11 @@ export default {
         return;
       }
       this.loading = true;
+      this.parmValue.bugNo = this.select === "1" ? this.input : "";
+      this.parmValue.title = this.select === "2" ? this.input : "";
+      this.parmValue.apply_name = this.select === "3" ? this.input : "";
+      this.parmValue.deal_name = this.select === "4" ? this.input : "";
+
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

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

@@ -141,7 +141,7 @@ export default {
     async submitForm() {
       this.loading = true;
       let model = {
-        manange_name: this.type,
+        company_id: this.type,
         id: this.checkedValue,
       };
       let res = await asyncRequest.MUpdate(model);