Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/Kingdee/LemonCloudSubjects.vue

@@ -128,18 +128,26 @@
     .cm_content._scrollbar{
       max-height: calc(100%-200px) !important;
     }
-  
+
   </style>
   <template>
     <div class="dianshangannualRatio" ref="barparent">
-        <div class="query-box" style="border: 0;padding: 0;">
+        <div class="query-box" style="border: 0;">
           <ul class="clearfix">
+            <li>
+              <span>状态</span>
+              <el-select v-model='msg.Enable' @change="getList">
+                <el-option key="0" value="0" label="不限"></el-option>
+                <el-option key="1" value="1" label="启用"></el-option>
+                <el-option key="2" value="2" label="禁用"></el-option>
+              </el-select>
+            </li>
             <li class="hight_query">
                 <button class="normalBtn" @click="outerVisible=true">导入</button>
             </li>
         </ul>
         </div>
-      <div class="cm_content _scrollbar" style="position: absolute;top:20px;bottom: 100px;left: 15px;right:15px;overflow-y: scroll;">
+      <div class="cm_content _scrollbar" style="position: absolute;top:60px;bottom: 100px;left: 15px;right:15px;overflow-y: scroll;">
         <table class="po_content singeRowTable"
         style="border:1px solid #E6E6E6;margin-top: 0;" cellspacing="0"
         cellpadding="0" v-loading="loading">
@@ -149,6 +157,7 @@
               <th>科目类别</th>
               <th>余额方向</th>
               <th>项目辅助核算 </th>
+              <th>状态 </th>
           </tr>
           <tr v-for="(item,index) in DataList" :key="index">
             <td>{{item.Name}}</td>
@@ -165,8 +174,19 @@
             <td>
               {{item.ItemCheck}}
             </td>
+            <td>
+              <el-tooltip :content="item.Enable==1?'禁用':item.Enable==2?'启用':''" placement="top">
+                <el-switch
+                  :disabled="item.disabled"
+                  @change="DisableEnable(item)"
+                  v-model="item.Enable"
+                  active-value="1"
+                  inactive-value="2">
+                </el-switch>
+              </el-tooltip>
+            </td>
           </tr>
-          
+
         </table>
         <div class="noData" v-if="DataList&&DataList.length==0">
           {{$t('system.content_noData')}}
@@ -181,10 +201,10 @@
               <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
               <!-- <div slot="tip" class="el-upload__tip">只能上传Excel文件</div> -->
             </el-upload>
-        
+
       </el-dialog>
-  
-  
+
+
     </div>
   </template>
   <script>
@@ -206,7 +226,8 @@
           imageUrl:'',
           outerVisible:false,
           msg:{
-            BranchId:'0',
+            BranchId: '0',
+            Enable: '0'
           },
           DataList:[],
           loading:false,
@@ -228,9 +249,43 @@
         this.Financial_post_GetEduBranchEnumList()
       },
       mounted(){
-  
+
       },
       methods: {
+        DisableEnable(item){
+          item.disabled = true
+          this.SetKingdeeSubjectEnable(item)
+        },
+        SetKingdeeSubjectEnable(item) {
+          let Enable
+          this.apipost('Financial_post_SetKingdeeSubjectEnable', {
+            SubjectId:item.Id
+          }, res => {
+            item.disabled = false
+            if (res.data.resultCode == 1) {
+              this.Success(res.data.message);
+              // this.getList();
+            } else {
+              if(item.Enable=='1'){
+                Enable='2'
+              }
+              if(item.Enable=='2'){
+                Enable='1'
+              }
+              item.Enable = Enable
+              this.$forceUpdate()
+              this.Error(res.data.message);
+            }
+          }, err => {
+            if(item.Enable=='1'){
+                Enable='2'
+              }
+              if(item.Enable=='2'){
+                Enable='1'
+              }
+              item.Enable = Enable
+          })
+        },
         Financial_post_GetEduBranchEnumList() {
           this.apipost('Financial_post_GetEduBranchEnumList', {}, res => {
             if (res.data.resultCode == 1) {
@@ -240,11 +295,11 @@
             }
           }, err => {})
         },
-        submitForm(addMsg) { 
+        submitForm(addMsg) {
           let that = this;
           that.$refs[addMsg].validate((valid) => {
             if (valid) {
-              
+
             } else {
               return false;
             }
@@ -266,11 +321,11 @@
             cancelButtonText: '取消',
             type: 'warning'
             }).then(() => {
-                
+
             }).catch(() => {
 
             });
-  
+
           }
         },
         resetPageIndex(){  // 重置页码
@@ -286,7 +341,16 @@
           this.apipost('Financial_post_GetKingdeeSubjectList', this.msg, res => {
             this.loading=false;
             if(res.data.resultCode == 1) {
+              let arrList = function(list){
+                list.forEach(x=>{
+                  x.disabled = false
+                })
+              }
+              arrList(res.data.data)
               this.DataList = res.data.data;
+              this.DataList.forEach(x => {
+                x.Enable = String(x.Enable)
+              });
               // this.total=res.data.data.count;
             } else {
               this.Error(res.data.message);
@@ -294,7 +358,6 @@
           }, err => {})
         },
       },
-  
+
     }
   </script>
-  
\ No newline at end of file

src/components/FinancialModule/Kingdee/RecPayQuery.vue

@@ -743,7 +743,7 @@
             <el-table :data="DataList" border style="width: 100%;font-size: 12px;" height="550">
           <el-table-column prop="FrID" label="单号" width="100">
             <template slot-scope='scope'>
-              {{scope.row.FrID}}
+              <span style="cursor: pointer;color: #00C6FF;" @click="openDetails(scope.row)">{{ scope.row.FrID }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="TradeDate" label="凭证日期" width="100"></el-table-column>
@@ -1103,6 +1103,17 @@
 
       },
       methods: {
+        // 单据详情
+        openDetails(item) {
+          let query = {
+            id: item.FrID,
+            blank: "y",
+          };
+          this.$router.push({
+            path: "/FinancialDocumentsDetail",
+            query
+          });
+        },
         Markers(){
           this.$confirm('是否确认标记此查询条件的下所有财务单据以导入至金蝶？', '提示', {
             confirmButtonText: '确定',