资质变更

src/dashoo.cn/backend/api/business/oilrtx/RtxService.go

@@ -4,7 +4,6 @@ import (
 	"dashoo.cn/utils"
 	"encoding/json"
 	"fmt"
-	"golang.org/x/text/encoding/simplifiedchinese"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -154,26 +153,24 @@ func (s *RtxService) RecursionOrganize(rtxOrganizes []RtxOrganize) bool {
 }
 
 func (s *RtxService) HandleSendMsg(username string, tomobile string, message string) *http.Response {
-	//client := &http.Client{}
-	var msg MsgTest
+	client := &http.Client{}
+	var msg Msg
 
 	msg.UserName = username
 	msg.ToMobile = tomobile
-	msg.Msg, _ = simplifiedchinese.GBK.NewEncoder().String(message)
-	msg.BizName = "scglxt"
-	msg.BizPwd = "scglxt"
-	msg.EXPCode = "19"
-	//json, err := json.Marshal(msg)
-	//params := string(json)
+	msg.Msg = message
+	json, err := json.Marshal(msg)
+	params := string(json)
 	//msgStr, _ := simplifiedchinese.GBK.NewEncoder().String(message)
-	url := "http://gateway.dgyt.com/devopsapi/msg?UserName=&ToMobile=" + tomobile + "&MSG=" + message
+	url := "http://gateway.dgyt.com/devopsapi/sendmsg"
 	//req, err := http.NewRequest("post", "http://api.uidp.dgyt.petrochina/SMS/API/sendSMS", strings.NewReader(params))
 	fmt.Println(url)
-	resp, err := http.Get(url)
+	req, err := http.NewRequest("post", url, strings.NewReader(params))
+	//resp, err := http.Get(url)
 	//req.Header.Add("Content-Type", "application/json")
 	//req.Header.Add("X-Token", "/LT6VRmkY8mpGHJzWMKxzMQhjbkXwAHsk0zJkRfAPtjC0Wsecn1539xiULbJU32D59Kh0jTuUD0=")
 
-	//resp, err := client.Do(req)
+	resp, err := client.Do(req)
 	if err != nil {
 		log.Println("err= ", err)
 	}

src/dashoo.cn/backend/api/business/oilrtx/rtx.go

@@ -13,9 +13,9 @@ type PtrUser struct {
 }
 
 type Msg struct {
-	UserName string `json:"UserName"`
-	ToMobile string `json:"ToMobile"`
-	Msg      string `json:"MSG"`
+	UserName string `json:"userName"`
+	ToMobile string `json:"toMobile"`
+	Msg      string `json:"msg"`
 }
 
 type MsgTest struct {

src/dashoo.cn/frontend_web/src/pages/index.vue

@@ -39,7 +39,7 @@
       </div>
       <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane name="first">
-          <span slot="label">待办任务<el-badge class="mark" :value="currentItemCount" style="margin-left: 5px; margin-top: 3px"/></span>
+          <span slot="label">待办任务</span>
           <el-table
           :data="entityListtode"
           size="mini"

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/auditoperation.vue

@@ -400,7 +400,7 @@
 
           </el-form>
         </el-tab-pane>
-        <el-tab-pane label="企业资质">
+        <el-tab-pane label="物资类">
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span style="font-weight: bold">企业资质</span>
@@ -443,6 +443,116 @@
               <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
             </el-table>
 
+            <el-pagination small
+                           @size-change="handleProjectSizeChange"
+                           @current-change="handleProjectCurrentChange"
+                           :current-page="currentPageProject"
+                           :page-sizes="[10, 20, 30]"
+                           :page-size="sizeProject"
+                           layout="total, sizes, prev, pager, next,jumper"
+                           :total="currentItemCountProject"
+                           style="margin: 5px;">
+            </el-pagination>
+          </el-card>
+        </el-tab-pane>
+        <el-tab-pane label="基建类">
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span style="font-weight: bold">企业资质</span>
+            </div>
+            <el-table :data="subfileList2" border>
+              <el-table-column label="操作" width="150" align="center" fixed>
+                <template slot-scope="scope">
+                  <el-button type="primary" plain size="mini" title="文件变更" @click="openDialog(scope.row)"
+                             :disabled="InfoStatus > 0 || butnab">
+                    变更</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="OldFileUrlList" label="原文件" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <div v-for="(tmpUrl, index) in scope.row.OldFileUrlList">
+                    <a :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank"
+                       class="buttonText">{{scope.row.OldFileName.split('$')[index]}}</a>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column prop="OldEffectDate" label="原有效日期" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ jstimehandle(scope.row.OldEffectDate+'') }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="FileUrlList" label="变更后文件" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <div v-for="(tmpUrl, index) in scope.row.FileUrlList">
+                    <a :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank"
+                       class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column prop="EffectDate" label="变更后有效日期" show-overflow-tooltip >
+                <template slot-scope="scope">
+                  {{ jstimehandle(scope.row.EffectDate+'') }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
+            </el-table>
+
+            <el-pagination small
+                           @size-change="handleProjectSizeChange"
+                           @current-change="handleProjectCurrentChange"
+                           :current-page="currentPageProject"
+                           :page-sizes="[10, 20, 30]"
+                           :page-size="sizeProject"
+                           layout="total, sizes, prev, pager, next,jumper"
+                           :total="currentItemCountProject"
+                           style="margin: 5px;">
+            </el-pagination>
+          </el-card>
+        </el-tab-pane>
+        <el-tab-pane label="技术服务类">
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span style="font-weight: bold">企业资质</span>
+            </div>
+            <el-table :data="subfileList3" border>
+              <el-table-column label="操作" width="150" align="center" fixed>
+                <template slot-scope="scope">
+                  <el-button type="primary" plain size="mini" title="文件变更" @click="openDialog(scope.row)"
+                             :disabled="InfoStatus > 0 || butnab">
+                    变更</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="OldFileUrlList" label="原文件" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <div v-for="(tmpUrl, index) in scope.row.OldFileUrlList">
+                    <a :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank"
+                       class="buttonText">{{scope.row.OldFileName.split('$')[index]}}</a>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column prop="OldEffectDate" label="原有效日期" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ jstimehandle(scope.row.OldEffectDate+'') }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="FileUrlList" label="变更后文件" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <div v-for="(tmpUrl, index) in scope.row.FileUrlList">
+                    <a :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank"
+                       class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column prop="EffectDate" label="变更后有效日期" show-overflow-tooltip >
+                <template slot-scope="scope">
+                  {{ jstimehandle(scope.row.EffectDate+'') }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
+            </el-table>
+
             <el-pagination small
                            @size-change="handleProjectSizeChange"
                            @current-change="handleProjectCurrentChange"
@@ -889,6 +999,8 @@
       this.auditget()
       this.getDictOptions()
       this.getfilelist1()
+      this.getfilelist2()
+      this.getfilelist3()
 
       this.getAccessCardNo()
     },
@@ -1197,7 +1309,7 @@
         let _this = this
         const params = {
           SupplierId: this.SuppId,
-          SupplierTypeCode: '\'01\',\'02\',\'03\'',
+          SupplierTypeCode: '01',
           _currentPage: this.currentPageProject,
           _size: this.sizeProject
         }
@@ -1472,7 +1584,7 @@
       },
       radioChange() {
         if (this.shenheForm.SuccessStatus === 1) {
-          
+
           if(this.InfoStatus == '5'){
             this.textplaceholder = ''
           }else{

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -415,7 +415,7 @@
 
           </el-form>
         </el-tab-pane>
-        <el-tab-pane label="企业资质">
+        <el-tab-pane label="物资类">
           <!-- <el-card class="box-card">
             <el-form :model="formData">
               <el-col :span="8">
@@ -486,22 +486,22 @@
           </el-card>
         </el-tab-pane>
 
-        <!-- <el-tab-pane label="基建类">
-          <el-card class="box-card">
-            <el-form :model="formData">
-              <el-col :span="8">
-                <el-form-item label="准入编码">
-                  <el-input v-model="AccessCardNo2" :readonly="true" placeholder="请输入" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-              </el-col>
-            </el-form>
-            <el-table :data="businessList2" border>
-              <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
-            </el-table>
-          </el-card>
+        <el-tab-pane label="基建类">
+          <!--<el-card class="box-card">-->
+            <!--<el-form :model="formData">-->
+              <!--<el-col :span="8">-->
+                <!--<el-form-item label="准入编码">-->
+                  <!--<el-input v-model="AccessCardNo2" :readonly="true" placeholder="请输入" style="width: 100%">-->
+                  <!--</el-input>-->
+                <!--</el-form-item>-->
+              <!--</el-col>-->
+            <!--</el-form>-->
+            <!--<el-table :data="businessList2" border>-->
+              <!--<el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>-->
+              <!--<el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>-->
+              <!--<el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>-->
+            <!--</el-table>-->
+          <!--</el-card>-->
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span style="font-weight: bold">企业资质</span>
@@ -544,23 +544,23 @@
               <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
             </el-table>
           </el-card>
-        </el-tab-pane> -->
-        <!-- <el-tab-pane label="技术服务类">
-          <el-card class="box-card">
-            <el-form :model="formData">
-              <el-col :span="8">
-                <el-form-item label="准入编码">
-                  <el-input v-model="AccessCardNo3" :readonly="true" placeholder="请输入" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-              </el-col>
-            </el-form>
-            <el-table :data="businessList3" border>
-              <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
-            </el-table>
-          </el-card>
+        </el-tab-pane>
+        <el-tab-pane label="技术服务类">
+          <!--<el-card class="box-card">-->
+            <!--<el-form :model="formData">-->
+              <!--<el-col :span="8">-->
+                <!--<el-form-item label="准入编码">-->
+                  <!--<el-input v-model="AccessCardNo3" :readonly="true" placeholder="请输入" style="width: 100%">-->
+                  <!--</el-input>-->
+                <!--</el-form-item>-->
+              <!--</el-col>-->
+            <!--</el-form>-->
+            <!--<el-table :data="businessList3" border>-->
+              <!--<el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>-->
+              <!--<el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>-->
+              <!--<el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>-->
+            <!--</el-table>-->
+          <!--</el-card>-->
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span style="font-weight: bold">企业资质</span>
@@ -603,7 +603,7 @@
               <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
             </el-table>
           </el-card>
-        </el-tab-pane> -->
+        </el-tab-pane>
       </el-tabs>
     </el-card>
     <el-dialog :title="Title" :visible.sync="visible" top="5vh">
@@ -1286,9 +1286,9 @@
       // this.getbusList1()
       this.getsubfile1()
       // this.getbusList2()
-      // this.getsubfile2()
+      this.getsubfile2()
       // this.getbusList3()
-      // this.getsubfile3()
+      this.getsubfile3()
       this.getFileDictOptions()
       // this.getAccessCardNo()
     },
@@ -1358,7 +1358,6 @@
             .then(res => {
               this.copyformdata = _.cloneDeep(res.data[0])
               this.formData = res.data[1]
-              console.log(res,"aaaaaaaaa")
               this.CityAry = []
               this.CityAry.push(this.formData.Province)
               this.CityAry.push(this.formData.City)
@@ -1413,7 +1412,7 @@
         let _this = this
         const params = {
           SupplierId: this.supplierId,
-          SupplierTypeCode: '\'01\',\'02\',\'03\'',
+          SupplierTypeCode: '01',
           _currentPage: this.currentPageProject,
           _size: this.sizeProject
         }