Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue

@@ -112,7 +112,6 @@ export default {
       // 查询 -----------
       tableKey: 0,
       list: [],
-      total: 1,
       listLoading: false,
       listQuery: {
         params: {
@@ -121,7 +120,8 @@ export default {
           userSid: ''
         },
         current: 1,
-        size: 5
+        size: 5,
+        total: 0
       },
       rules: {}
       // ------------------------------------
@@ -198,10 +198,10 @@ export default {
         this.listLoading = false
         if (response.code === '200' && response.data && response.data.total > 0) {
           this.list = response.data.records
-          this.total = response.data.total
+          this.listQuery.total = response.data.total
         } else {
           this.list = []
-          this.total = 0
+          this.listQuery.total = 0
         }
       })
     },

anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue

@@ -64,10 +64,10 @@
           </el-row>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>供应商办公电话</span>
+              <span>供应商办公电话</span>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="manufacturerTelePhone">
+              <el-form-item>
                 <el-input v-model="baseManufacturerDto.manufacturerTelePhone" maxlength="20" placeholder="例:010-88888888" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
@@ -200,13 +200,6 @@ export default {
         callback()
       }
     }
-    var checkBanGongDianHua = (rule, value, callback) => {
-      const BanGongDianHua = /\d{3}-\d{8}|\d{4}-\d{7}/
-      if (BanGongDianHua.test(value)) {
-        return callback()
-      }
-      callback(new Error('请输入办公电话'))
-    }
     return {
       tableKey: 0,
       index: 0,
@@ -251,11 +244,6 @@ export default {
           message: '请填写供应商通讯地址',
           trigger: 'blur'
         }],
-        manufacturerTelePhone: [{
-          required: true,
-          validator: checkBanGongDianHua,
-          trigger: 'blur'
-        }],
         manufacturerFax: [{
           required: true,
           validator: checkChuanzhen,

anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!-- Start 列表页面 -->
-    <div>
+    <div v-show="viewState == 1">
       <button-bar view-title="厂家系统认款" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="main-content">
         <div class="searchcon">
@@ -61,7 +61,7 @@
             </el-table-column>
             <el-table-column label="申请编号" align="center" width="200px">
               <template slot-scope="scope">
-                <span>{{ scope.row.proSchAppNo }}</span>
+                <span class="bluezi" @click="handleLook(scope.row.vehApplySid)">{{ scope.row.proSchAppNo }}</span>
               </template>
             </el-table-column>
             <el-table-column label="采购类型" align="center" width="200px">
@@ -111,6 +111,7 @@
       </div>
     </div>
     <!-- End 列表页面 -->
+    <cheliangpaichanInfo v-show="viewState == 2" ref="divInfo" @doback="reseaState"/>
     <!-- 照片弹窗 -->
     <el-dialog :append-to-body="true" :visible.sync="dialogImgVisible">
       <img width="100%" :src="dialogImageUrl" alt="" />
@@ -125,6 +126,7 @@ import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import upload from '@/components/uploadFileimg/upload'
+import cheliangpaichanInfo from '../../supplychain/cheliangpaichan/cheliangpaichanInfo'
 
 export default {
   name: 'changjiaxitongrenkuan',
@@ -132,11 +134,13 @@ export default {
     Pagination,
     pageye,
     upload,
-    ButtonBar
+    ButtonBar,
+    cheliangpaichanInfo
   },
   data() {
     return {
       btndisabled: false,
+      viewState: 1,
       btnList: [
         {
           type: 'info',
@@ -289,6 +293,10 @@ export default {
       }
       this.init()
     },
+    handleLook(sid) {
+      this.viewState = 2
+      this.$refs['divInfo'].showInfo(sid)
+    },
     handPass(row) {
       req.adopt({ sid: row.sid, remarks: row.remarks, userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
         if (res.success) {
@@ -301,6 +309,9 @@ export default {
       this.dialogImgVisible = true
       this.dialogImageUrl = row.witMatUrl
     },
+    reseaState() {
+      this.viewState = 1
+    },
     doClose() {
       this.$store.dispatch('tagsView/delView', this.$route)
       this.$router.go(-1)