huk пре 3 година
родитељ
комит
f687b3c4bb

+ 4 - 1
src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelNewMonitor.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -39,6 +39,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
+    .input{
+      width: 250px;
+    }
   }
 }
 </style>

+ 4 - 1
src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelOldMonitor.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="purchasFuelOldMonitor">
     <div class="frameCalculation">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -39,6 +39,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
+    .input{
+      width: 250px;
+    }
   }
 }
 </style>

+ 4 - 1
src/views/statisticalReport/components/purchaseAccessoriesMonitor.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="purchaseAccessoriesMonitor">
     <div class="frameCalculation">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -39,6 +39,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
+    .input{
+      width: 250px;
+    }
   }
 }
 </style>

+ 11 - 50
src/views/systemConfig/components/organizManage.vue

@@ -1,22 +1,6 @@
 <template>
   <div class="organizManage-main">
     <div class="organizManage-mainLeft">
-      <!-- 下拉选择公司 -->
-      <!-- <div class="_company-select" v-if="companys !== '' && companys.length > 1">
-                <el-dropdown
-                    trigger="click"
-                    @command="selectComPany"
-                >
-                    <span class="el-dropdown-link">
-                        {{companyName}}<i class="el-icon-arrow-down el-icon--right"></i>
-                    </span>
-                    <el-dropdown-menu slot="dropdown">
-                        <div v-for="item in companys" :key="item.id">
-                            <el-dropdown-item :command="item">{{item.companyName}}</el-dropdown-item>
-                        </div>
-                    </el-dropdown-menu>
-                </el-dropdown>
-            </div> -->
       <div class="public-function-div">
         机构树
         <el-button
@@ -26,18 +10,6 @@
           class="orgShowHidden"
           >{{ isAllDataShow ? "显示停用组织" : "隐藏停用组织" }}</el-button
         >
-        <!-- <el-button
-                    @click="setCheckedNodes"
-                    type="success"
-                    size="small"
-                    class="refresh"
-                >展开</el-button>
-                <el-button
-                    @click="setCheckedKeys"
-                    type="success"
-                    size="small"
-                    class="refresh2"
-                >收起</el-button> -->
         <el-button
           @click="controllNode()"
           type="success"
@@ -183,20 +155,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="12">
-            <el-form-item label="机构类别"
-                          prop="cate">
-              <el-select v-model="formItem.cate"
-                         style="width: 100%;"
-                         size="small"
-                         @change="changeval">
-                <el-option v-for="item in dataDictionary.state.dict.CATE"
-                           :value="item.value"
-                           :key="item.value"
-                           :label="item.label"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="12">
             <el-form-item label="机构编码" prop="orgCode">
               <el-input
@@ -207,13 +165,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="12">
-            <el-form-item label="机构级别" prop="rank">
-              <el-select v-model="formItem.rank" style="width: 100%;" size="small">
-                <el-option v-for="item in formItemRank" :value="item.value" :key="item.value"  :label="item.label"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="12">
             <el-form-item label="机构名称" prop="orgName">
               <el-input
@@ -1205,7 +1156,12 @@ export default {
                     form: data,
                   })
                   .then((res) => {
-                    //
+                    console.log(res,'修改成功')
+                    console.log(res.data.orgId,'机构主键id');
+                    console.log(res.data.depType,"机构级别");
+                    console.log(res.data.orgName,"机构名称");
+                    console.log(res.data.pId,"父级机构id");
+                    
                     this.addLoading1 = false;
                     //
                     if (res.code === "0") {
@@ -1251,6 +1207,11 @@ export default {
             this.store
               .dispatch("system/organizManage/addOrg", data)
               .then((res) => {
+                console.log(res,'添加成功')
+                console.log(res.data.orgId,'机构主键id');
+                console.log(res.data.depType,"机构级别");
+                console.log(res.data.orgName,"机构名称");
+                console.log(res.data.pId,"父级机构id");
                 //
                 this.addLoading2 = false;
                 //