瀏覽代碼

粮脉企业

huangfuli 3 年之前
父節點
當前提交
7cf62539ad

+ 11 - 1
src/api/V2/platformaudit/index.js

@@ -2,7 +2,7 @@
 export const API_POST_GRAINMERCHANTREVIEW = '/identityAuthenticationInfo/api/examine'
 export const API_POST_GRAINMERCHANTREVIEW = '/identityAuthenticationInfo/api/examine'
 //司机审核
 //司机审核
 export const API_POST_DRIVERREVIEW = '/driverViewInfo/api/examine'
 export const API_POST_DRIVERREVIEW = '/driverViewInfo/api/examine'
-//交易信息审核
+//交易信息审核(采购)
 export const API_POST_TRANSACTIONINFORMATIONREVIEW = '/procurementPlanInfo/api/examine'
 export const API_POST_TRANSACTIONINFORMATIONREVIEW = '/procurementPlanInfo/api/examine'
 //粮商列表
 //粮商列表
 export const API_GET_GRAINMERCHANT_LIST = '/identityAuthenticationInfo/selectIdentityAuthenticationInfoPc'
 export const API_GET_GRAINMERCHANT_LIST = '/identityAuthenticationInfo/selectIdentityAuthenticationInfoPc'
@@ -26,4 +26,14 @@ export const API_GET_DYNAMICS_LOOK = '/settledCompanyDynamics/getSettledCompanyD
 export const API_POST_DYNAMICS_DELETE = '/settledCompanyDynamics/api/deleteSettledCompanyInfo'
 export const API_POST_DYNAMICS_DELETE = '/settledCompanyDynamics/api/deleteSettledCompanyInfo'
 //粮脉动态审核
 //粮脉动态审核
 export const API_POST_DYNAMICS_EXAMINE = '/settledCompanyDynamics/api/examine'
 export const API_POST_DYNAMICS_EXAMINE = '/settledCompanyDynamics/api/examine'
+//粮脉企业审核列表
+export const API_GET_SETTLEDCOMPANY_LIST = '/settledCompanyInfo/selectSettledCompanyInfo'
+//粮脉企业审核查看
+export const API_GET_SETTLEDCOMPANY = '/settledCompanyInfo/getSettledCompanyInfo'
+//粮脉企业审核编辑
+export const API_POST_EDIT_SETTLEDCOMPANY = '/settledCompanyInfo/api/editSettledCompanyInfo'
+//粮脉企业审核
+export const API_POST_SETTLED_EXAMINE = '/settledCompanyInfo/api/examine'
+//粮脉企业审核删除
+export const API_POST_DELETE_SETTLED = '/settledCompanyInfo/api/deleteSettledCompanyInfo'
 
 

+ 16 - 1
src/model/platformaudit/index.js

@@ -15,6 +15,11 @@ import {
     API_GET_DYNAMICS_LOOK,
     API_GET_DYNAMICS_LOOK,
     API_POST_DYNAMICS_DELETE,
     API_POST_DYNAMICS_DELETE,
     API_POST_DYNAMICS_EXAMINE,
     API_POST_DYNAMICS_EXAMINE,
+    API_GET_SETTLEDCOMPANY_LIST,
+    API_GET_SETTLEDCOMPANY,
+    API_POST_EDIT_SETTLEDCOMPANY,
+    API_POST_SETTLED_EXAMINE,
+    API_POST_DELETE_SETTLED,
 } from '@/api/V2/platformaudit'
 } from '@/api/V2/platformaudit'
 // import { app } from 'electron'
 // import { app } from 'electron'
 // 粮商审核
 // 粮商审核
@@ -44,4 +49,14 @@ export const dynamicsLook = appRx.get(API_GET_DYNAMICS_LOOK, errorCatcher, error
 // 粮脉动态审核(删除)
 // 粮脉动态审核(删除)
 export const dynamicsDelete = appRx.post(API_POST_DYNAMICS_DELETE, errorCatcher, errorHandle, filter)
 export const dynamicsDelete = appRx.post(API_POST_DYNAMICS_DELETE, errorCatcher, errorHandle, filter)
 // 粮脉动态审核
 // 粮脉动态审核
-export const dynamicsExamine = appRx.post(API_POST_DYNAMICS_EXAMINE, errorCatcher, errorHandle, filter)
+export const dynamicsExamine = appRx.post(API_POST_DYNAMICS_EXAMINE, errorCatcher, errorHandle, filter)
+//粮脉企业审核列表
+export const settledList = appRx.get(API_GET_SETTLEDCOMPANY_LIST, errorCatcher, errorHandle, filter)
+//粮脉企业审核查看
+export const getSettled = appRx.get(API_GET_SETTLEDCOMPANY, errorCatcher, errorHandle, filter)
+//粮脉企业审核编辑
+export const editSettled = appRx.post(API_POST_EDIT_SETTLEDCOMPANY, errorCatcher, errorHandle, filter)
+//粮脉企业审核
+export const settledExamine = appRx.post(API_POST_SETTLED_EXAMINE, errorCatcher, errorHandle, filter)
+//粮脉企业审核删除
+export const deleteSettled = appRx.post(API_POST_DELETE_SETTLED, errorCatcher, errorHandle, filter)

+ 319 - 122
src/views/platformaudit/grainpulseenterprisereview.vue

@@ -54,10 +54,11 @@
             <span v-else>{{ scope.$index + 1 }}</span>
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-        <el-table-column prop="seller" label="昵称"> </el-table-column>
-        <el-table-column prop="seller" label="账号"> </el-table-column>
-        <el-table-column prop="seller" label="企业名称"> </el-table-column>
-        <el-table-column prop="seller" label="地址"> </el-table-column>
+        <el-table-column prop="userName" label="昵称"> </el-table-column>
+        <el-table-column prop="createPhone" label="账号"> </el-table-column>
+        <el-table-column prop="compName" label="企业名称"> </el-table-column>
+        <el-table-column prop="address" label="地址">
+        </el-table-column>
         <el-table-column prop="updateDate" label="更新时间" width="140">
         <el-table-column prop="updateDate" label="更新时间" width="140">
         </el-table-column>
         </el-table-column>
         <el-table-column prop="" label="操作" width="240">
         <el-table-column prop="" label="操作" width="240">
@@ -135,75 +136,58 @@
         <el-form class="customer" :model="form">
         <el-form class="customer" :model="form">
           <h3 style="margin-left: 30px">基本信息</h3>
           <h3 style="margin-left: 30px">基本信息</h3>
           <el-form-item label="公司名称" :label-width="formLabelWidth">
           <el-form-item label="公司名称" :label-width="formLabelWidth">
-            {{ 111111 }}
+            {{ companyList.compName }}
           </el-form-item>
           </el-form-item>
           <el-form-item label="主营类型" :label-width="formLabelWidth">
           <el-form-item label="主营类型" :label-width="formLabelWidth">
-            {{ 111111 }}
+            {{ companyList.mainBusinessType }}
           </el-form-item>
           </el-form-item>
           <el-form-item label="标题" :label-width="formLabelWidth">
           <el-form-item label="标题" :label-width="formLabelWidth">
-            {{ 111111 }}
+            {{ companyList.title }}
           </el-form-item>
           </el-form-item>
           <el-form-item label="封面简介" :label-width="formLabelWidth">
           <el-form-item label="封面简介" :label-width="formLabelWidth">
-            {{ 111111 }}
+            {{ companyList.companyProfile }}
           </el-form-item>
           </el-form-item>
           <el-form-item label="坐标" :label-width="formLabelWidth">
           <el-form-item label="坐标" :label-width="formLabelWidth">
-            {{ 11111 }}
+            <span>经度:{{ companyList.longitude }}</span>
+            <span>纬度:{{ companyList.latitude }}</span>
           </el-form-item>
           </el-form-item>
           <el-form-item label="所在区域" :label-width="formLabelWidth">
           <el-form-item label="所在区域" :label-width="formLabelWidth">
-            {{ 111111 }}
+            {{ companyList.province }}{{ companyList.city }}{{ companyList.area }}
           </el-form-item>
           </el-form-item>
           <el-form-item label="详细地址" :label-width="formLabelWidth">
           <el-form-item label="详细地址" :label-width="formLabelWidth">
-            {{ 11111111 }}
+            {{ companyList.detailedAddress }}
           </el-form-item>
           </el-form-item>
-          <h4>上传封面图片</h4>
-          <img width="50%" :src="111" alt />
+          <h4>封面图片</h4>
+          <img width="50%" :src="companyList.attachmentAddress" alt />
           <h4>营业执照</h4>
           <h4>营业执照</h4>
-          <img width="50%" :src="1111" alt />
+          <img width="50%" :src="companyList.licenseAddress" alt />
           <h3 style="margin-left: 30px">附加信息</h3>
           <h3 style="margin-left: 30px">附加信息</h3>
           <el-form-item label="企业概况" :label-width="formLabelWidth">
           <el-form-item label="企业概况" :label-width="formLabelWidth">
-            {{ 1111111 }}
+            {{ companyList.companyContant }}
           </el-form-item>
           </el-form-item>
           <el-form-item label="标签" :label-width="formLabelWidth">
           <el-form-item label="标签" :label-width="formLabelWidth">
-            {{ 1111111 }}
+            {{ companyList.label }}
           </el-form-item>
           </el-form-item>
           <h4>场地图片</h4>
           <h4>场地图片</h4>
-          <img width="50%" :src="1111" alt />
+          <img width="50%" :src="companyList.sitePhotoAddress" alt />
           <h3 style="margin-left: 30px">联系方式</h3>
           <h3 style="margin-left: 30px">联系方式</h3>
           <el-form-item label="联系人" :label-width="formLabelWidth">
           <el-form-item label="联系人" :label-width="formLabelWidth">
-            {{ 11111 }}
+            {{ companyList.contacts }}
           </el-form-item>
           </el-form-item>
           <el-form-item label="电话" :label-width="formLabelWidth">
           <el-form-item label="电话" :label-width="formLabelWidth">
-            {{ 1111111 }}
+            {{ companyList.createPhone }}
           </el-form-item>
           </el-form-item>
           <el-form-item label="邮箱" :label-width="formLabelWidth">
           <el-form-item label="邮箱" :label-width="formLabelWidth">
-            {{ 111111 }}
+            {{ companyList.email }}
           </el-form-item>
           </el-form-item>
           <el-form-item label="传真" :label-width="formLabelWidth">
           <el-form-item label="传真" :label-width="formLabelWidth">
-            {{ 1111111 }}
+            {{ companyList.fax }}
           </el-form-item>
           </el-form-item>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogFormVisible1 = false">关闭</el-button>
-          <template slot-scope="scope">
-            <el-button
-              size="medium"
-              type="text"
-              class="record"
-              v-if="scope.row.statusFlag == 1"
-              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
-              @click="reject(scope.row)"
-              >驳回</el-button
-            >
-            <el-button
-              size="medium"
-              type="text"
-              class="record"
-              v-if="scope.row.statusFlag == 1"
-              @click="adopt(scope.row)"
-              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
-              >通过</el-button
-            >
-          </template>
+          <el-button v-if="companyList.statusFlag != 1" @click="dialogFormVisible1 = false" type="primary">关闭</el-button>
+          <el-button v-if="companyList.statusFlag == 1" @click="reject1(id)" type="danger">驳回</el-button>
+          <el-button v-if="companyList.statusFlag == 1" @click="adopt1(id)"  type="primary">通过</el-button>     
         </div>
         </div>
       </el-dialog>
       </el-dialog>
       <!--编辑-->
       <!--编辑-->
@@ -215,93 +199,152 @@
       >
       >
         <el-form class="" :model="form1">
         <el-form class="" :model="form1">
           <h3 style="margin-left: 30px">基本信息(必填)</h3>
           <h3 style="margin-left: 30px">基本信息(必填)</h3>
-          <el-form-item label="公司名称" :label-width="formLabelWidth">
-            <el-input v-model="form.name"></el-input>
+          <el-form-item label="公司名称" :label-width="formLabelWidth" prop="compName">
+            <el-input v-model="companyList1.compName" placeholder="请输入公司名称"></el-input>
           </el-form-item>
           </el-form-item>
-          <el-form-item label="主营类型(可多选,必须为真实经营类型)">
-            <el-checkbox-group v-model="form1.type" style="">
-              <el-checkbox-button label="粮库" name="type"></el-checkbox-button>
-              <el-checkbox-button label="加工厂" name="type"></el-checkbox-button>
-              <el-checkbox-button label="烘干塔" name="type"></el-checkbox-button>
-              <el-checkbox-button label="饲料厂" name="type"></el-checkbox-button>
-              <el-checkbox-button label="养殖厂" name="type"></el-checkbox-button>
-              <el-checkbox-button label="粮贸" name="type"></el-checkbox-button>
-              <el-checkbox-button label="期货" name="type"></el-checkbox-button>
+          <el-form-item label="主营类型(可多选,必须为真实经营类型)" prop="mainBusinessType">
+            <el-checkbox-group v-model="companyList1.mainBusinessType" style="">
+              <el-checkbox-button label="粮库" name="Type"></el-checkbox-button>
+              <el-checkbox-button label="加工厂" name="Type"></el-checkbox-button>
+              <el-checkbox-button label="烘干塔" name="Type"></el-checkbox-button>
+              <el-checkbox-button label="饲料厂" name="Type"></el-checkbox-button>
+              <el-checkbox-button label="养殖厂" name="Type"></el-checkbox-button>
+              <el-checkbox-button label="粮贸" name="Type"></el-checkbox-button>
+              <el-checkbox-button label="期货" name="Type"></el-checkbox-button>
             </el-checkbox-group>
             </el-checkbox-group>
           </el-form-item>
           </el-form-item>
-          <el-form-item label="标题" :label-width="formLabelWidth">
-            <el-input v-model="form.name"></el-input>
+          <el-form-item label="标题" :label-width="formLabelWidth" prop="title">
+            <el-input v-model="companyList1.title" placeholder="请输入标题"></el-input>
           </el-form-item>
           </el-form-item>
-          <el-form-item label="封面简介" :label-width="formLabelWidth">
-            <el-input type="textarea" v-model="form.desc"></el-input>
+          <el-form-item label="封面简介" :label-width="formLabelWidth" prop="companyProfile">
+            <el-input type="textarea" v-model="companyList1.companyProfile" placeholder="请输入封面简介"></el-input>
           </el-form-item>
           </el-form-item>
-          <el-form-item label="坐标" :label-width="formLabelWidth">
-            {{ 11111 }}
+          <el-form-item label="坐标" :label-width="formLabelWidth" >
+            <span>经度:{{ companyList1.longitude }}</span>
+            <span>纬度:{{ companyList1.latitude }}</span>
           </el-form-item>
           </el-form-item>
-          <el-form-item label="所在区域" :label-width="formLabelWidth">
-            <el-input v-model="form.name"></el-input>
+          <el-form-item label="所在区域" :label-width="formLabelWidth" prop="adress">
+            <el-input v-model="companyList1.adress" placeholder="请输入所在区域"></el-input>
           </el-form-item>
           </el-form-item>
-          <el-form-item label="详细地址" :label-width="formLabelWidth">
-            <el-input v-model="form.name"></el-input>
+          <el-form-item label="详细地址" :label-width="formLabelWidth" prop="detailedAddress">
+            <el-input v-model="companyList1.detailedAddress" placeholder="请输入详细地址"></el-input>
           </el-form-item>
           </el-form-item>
           <h4>上传封面图片</h4>
           <h4>上传封面图片</h4>
-          <img width="50%" :src="111" alt />
+          <el-upload
+            action="https://www.zthymaoyi.com/upload/admin"
+            list-type="picture-card"
+            :on-preview="handlePictureCardPreview"
+            :on-remove="handleRemove"
+          >
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt="" />
+          </el-dialog>
+
           <h4>营业执照</h4>
           <h4>营业执照</h4>
-          <img width="50%" :src="1111" alt />
+          <el-upload
+            action="https://www.zthymaoyi.com/upload/admin"
+            list-type="picture-card"
+            :on-preview="handlePictureCardPreview"
+            :on-remove="handleRemove"
+          >
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt="" />
+          </el-dialog>
+
           <h3 style="margin-left: 30px">附加信息(选填)</h3>
           <h3 style="margin-left: 30px">附加信息(选填)</h3>
-          <el-form-item label="企业概况" :label-width="formLabelWidth">
-            <el-input type="textarea" v-model="form.desc"></el-input>
+          <el-form-item label="企业概况" :label-width="formLabelWidth" prop="companyContant">
+            <el-input type="textarea" v-model="companyList1.companyContant" placeholder="请输入企业概况,如经营项目、产品类型、企业规模等,不超过300字"></el-input>
           </el-form-item>
           </el-form-item>
-          <el-form-item label="标签(标签应突出企业特色,最多6个)" >
-            
+          <el-form-item label="标签(标签应突出企业特色,最多6个)" prop="label">
+            <el-tag
+              :key="tag"
+              v-for="tag in dynamicTags"
+              closable
+              :disable-transitions="false"
+              @close="handleClose(tag)"
+            >
+              {{ tag }}
+            </el-tag>
+            <el-input
+              class="input-new-tag"
+              v-if="inputVisible"
+              v-model="companyList1.label"
+              ref="saveTagInput"
+              size="small"
+              placeholder="请输入标签内容,不超过6个字符"
+              @keyup.enter.native="handleInputConfirm"
+              @blur="handleInputConfirm"
+            >
+            </el-input>
+            <el-button
+              v-else
+              class="button-new-tag"
+              size="small"
+              @click="showInput"
+              >添加</el-button
+            >
           </el-form-item>
           </el-form-item>
-          <h4>场地图片</h4>
-          <img width="50%" :src="1111" alt />
+          <h4>场地图片(图片清晰,最多9张)</h4>
+          <el-upload
+            action="https://www.zthymaoyi.com/upload/admin"
+            list-type="picture-card"
+            :on-preview="handlePictureCardPreview"
+            :on-remove="handleRemove"
+          >
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt="" />
+          </el-dialog>
+
           <h3 style="margin-left: 30px">联系方式</h3>
           <h3 style="margin-left: 30px">联系方式</h3>
           <div :key="index" v-for="(item, index) in freightspace">
           <div :key="index" v-for="(item, index) in freightspace">
-            <el-form-item label="联系人" :label-width="formLabelWidth">
-                <el-input v-model="form.name"></el-input>
+            <el-form-item label="联系人" :label-width="formLabelWidth" prop="contacts">
+              <el-input v-model="companyList1.contacts" placeholder="请输入联系人姓名"></el-input>
             </el-form-item>
             </el-form-item>
-            <el-form-item label="电话" :label-width="formLabelWidth">
-                <el-input v-model="form.name"></el-input>
+            <el-form-item label="电话" :label-width="formLabelWidth" prop="createPhone">
+              <el-input v-model="companyList1.createPhone" placeholder="请输入联系人电话"></el-input>
             </el-form-item>
             </el-form-item>
-              <img
-            width="22"
-            height="22"
-            class="add"
-            @click="add"
-            src="../../../public/img/add.png"
-            alt=""
-          />
-          <img
-            width="22"
-            height="22"
-            class="del"
-            @click="del(index)"
-            src="../../../public/img/del.png"
-            alt=""
-          />
+            <img
+              width="22"
+              height="22"
+              class="add"
+              @click="add()"
+              src="../../../public/img/add.png"
+              alt=""
+            />
+            <img
+              width="22"
+              height="22"
+              class="del"
+              @click="del(index)"
+              src="../../../public/img/del.png"
+              alt=""
+            />
           </div>
           </div>
-          <el-form-item label="邮箱" :label-width="formLabelWidth">
-            <el-input v-model="form.name"></el-input>
+          <el-form-item label="邮箱" :label-width="formLabelWidth" prop="email">
+            <el-input v-model="companyList1.email" placeholder="请输入电子邮箱"></el-input>
           </el-form-item>
           </el-form-item>
-          <el-form-item label="传真" :label-width="formLabelWidth">
-            <el-input v-model="form.name"></el-input>
+          <el-form-item label="传真" :label-width="formLabelWidth" prop="fax">
+            <el-input v-model="companyList1.fax" placeholder="请输入传真号"></el-input>
           </el-form-item>
           </el-form-item>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button @click="submit()">提交</el-button>
+          <el-button @click="submit(id)" type="primary">提交</el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-import { saleList, deletesale, saleexamine } from '@/model/platformaudit/index'
+import { settledList,getSettled,editSettled,settledExamine,deleteSettled  } from '@/model/platformaudit/index'
 import Pagination from '@/components/Pagination'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import WsUpload from '@/components/WsUpload'
 import { EventBus } from 'base-core-lib'
 import { EventBus } from 'base-core-lib'
-// const cityOptions = ['粮库', '加工厂', '烘干塔', '饲料厂', '养殖厂', '粮贸', '期货'];
 export default {
 export default {
   name: 'viewSpareMoney',
   name: 'viewSpareMoney',
   components: {
   components: {
@@ -318,12 +361,17 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
+      //标签
+      dynamicTags: [],
+      inputVisible: false,
+      // inputValue: '',
+      //图片
+      dialogImageUrl: '',
+      dialogVisible: false,
+      //弹窗
       dialogFormVisible1: false,
       dialogFormVisible1: false,
       dialogFormVisible2: false,
       dialogFormVisible2: false,
       checkboxGroup2: [],
       checkboxGroup2: [],
-      // 表格显示数据
-      tableDate: [],
-
       // 是否显示
       // 是否显示
       showType: true,
       showType: true,
       // 年
       // 年
@@ -336,13 +384,14 @@ export default {
       // 提交类型
       // 提交类型
       submitType: true,
       submitType: true,
       size: 10,
       size: 10,
-      spanArr: [],
-      warehouseName: '',
+      address:'',
       searchType: 1,
       searchType: 1,
       formLabelWidth: '120px',
       formLabelWidth: '120px',
       form: {},
       form: {},
       form1: {
       form1: {
         type: [],
         type: [],
+        textarea: '',
+
       },
       },
       compId: sessionStorage.getItem('ws-pf_compId'),
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       deptCircularPage: {},
@@ -353,11 +402,17 @@ export default {
         { value: '未通过', type: 3 },
         { value: '未通过', type: 3 },
         { value: '全部', type: '' },
         { value: '全部', type: '' },
       ],
       ],
-      salePlanInfo: {
+      companyList: {
+      },
+      companyList1: {
+        id:'',
+        label:'',
+      },
+      settledCompanyInfo: {
         id: '',
         id: '',
         flag: '',
         flag: '',
       },
       },
-      freightspace: [{  }],
+      freightspace: [{}],
       pickerBeginDateBefore: {
       pickerBeginDateBefore: {
         disabledDate: (time) => {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
           return time.getTime() > Date.now()
@@ -370,19 +425,34 @@ export default {
     this.showType = this.isShow
     this.showType = this.isShow
   },
   },
   methods: {
   methods: {
+    //图片
+    handleRemove(file, fileList) {
+      console.log(file, fileList)
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    close(index) {
+      this.addressUrls.splice(index, 1)
+    },
+    //联系人
     add() {
     add() {
-      this.freightspace.push({
-
-      })
+      this.freightspace.push({})
     },
     },
     del(index) {
     del(index) {
       if (this.freightspace.length > 1) {
       if (this.freightspace.length > 1) {
         this.freightspace.splice(index, 1)
         this.freightspace.splice(index, 1)
       }
       }
     },
     },
+    // 上传附件
+    uploadSuccessHandle(e) {
+      this.deptBudgetList.addressUrl += e.url + ','
+      this.addressUrls.push(e.url)
+    },
     //列表
     //列表
     getList() {
     getList() {
-      saleList({
+      settledList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         compId: sessionStorage.getItem('ws-pf_compId'),
         searchType: this.searchType,
         searchType: this.searchType,
         currentPage: this.currentPage,
         currentPage: this.currentPage,
@@ -392,6 +462,9 @@ export default {
         .toPromise()
         .toPromise()
         .then((response) => {
         .then((response) => {
           this.grainList = response
           this.grainList = response
+          for(var i=0;i<this.grainList.records.length;i++){
+            this.grainList.records[i].address=this.grainList.records[i].province+this.grainList.records[i].city+this.grainList.records[i].area+this.grainList.records[i].detailedAddress
+          }
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
           this.deptBudgetTotal = response.total
@@ -405,7 +478,7 @@ export default {
         type: 'warning',
         type: 'warning',
       })
       })
         .then(() => {
         .then(() => {
-          deletesale({
+          deleteSettled({
             id: row.id,
             id: row.id,
           })
           })
             .toPromise()
             .toPromise()
@@ -418,12 +491,49 @@ export default {
         })
         })
     },
     },
     //查看
     //查看
-    nocomplete(item) {
-      this.dialogFormVisible1 = true
+    nocomplete(row) {
+      getSettled({ id: row.id })
+        .toPromise()
+        .then((response) => {
+          this.companyList = response
+          this.id=response.id
+            this.dialogFormVisible1 = true
+        })
     },
     },
     //编辑
     //编辑
-    delivery(item) {
-      this.dialogFormVisible2 = true
+    delivery(row) {
+      getSettled({ id: row.id })
+        .toPromise()
+        .then((response) => {
+          this.companyList1 = response
+          this.id=response.id
+            this.dialogFormVisible2 = true
+        })
+    },
+    submit(id){
+      this.companyList1.id = id
+      this.$confirm(`确定提交企业信息?`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning'
+      })
+      .then(() => {
+          editSettled(this.companyList1)
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '提交成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {
+              EventBus.$emit('error', response.message)
+            })
+        })
+        .catch(() => {
+          return false
+        })
     },
     },
     //查找
     //查找
     lookUp() {
     lookUp() {
@@ -439,17 +549,71 @@ export default {
       this.currentPage = 1
       this.currentPage = 1
       this.getList()
       this.getList()
     },
     },
+    //查看审核通过
+    adopt1(id) {
+      this.settledCompanyInfo.id = id
+      this.settledCompanyInfo.flag = 1
+      this.$confirm(`确定通过该入驻申请?`, '提示', {
+        confirmButtonText: '通过',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          settledExamine(this.settledCompanyInfo)
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '通过成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {
+              EventBus.$emit('error', response.message)
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    //查看审核驳回
+    reject1(id) {
+      this.settledCompanyInfo.id = id
+      this.settledCompanyInfo.flag = 2
+      this.$confirm(`确定驳回该入驻申请?`, '提示', {
+        confirmButtonText: '驳回',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          settledExamine(this.settledCompanyInfo)
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '驳回成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {
+              EventBus.$emit('error', response.message)
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
     //审核通过
     //审核通过
     adopt(row) {
     adopt(row) {
-      this.salePlanInfo.id = row.id
-      this.salePlanInfo.flag = 1
+      this.settledCompanyInfo.id = row.id
+      this.settledCompanyInfo.flag = 1
       this.$confirm(`确定通过该入驻申请?`, '提示', {
       this.$confirm(`确定通过该入驻申请?`, '提示', {
         confirmButtonText: '通过',
         confirmButtonText: '通过',
         cancelButtonText: '取消',
         cancelButtonText: '取消',
         type: 'warning',
         type: 'warning',
       })
       })
         .then(() => {
         .then(() => {
-          saleexamine(this.salePlanInfo)
+          settledExamine(this.settledCompanyInfo)
             .toPromise()
             .toPromise()
             .then((response) => {
             .then((response) => {
               this.$notify.success({
               this.$notify.success({
@@ -459,7 +623,6 @@ export default {
               this.getList()
               this.getList()
             })
             })
             .catch((response) => {
             .catch((response) => {
-              console.log(response)
               EventBus.$emit('error', response.message)
               EventBus.$emit('error', response.message)
             })
             })
         })
         })
@@ -469,15 +632,15 @@ export default {
     },
     },
     //审核驳回
     //审核驳回
     reject(row) {
     reject(row) {
-      this.salePlanInfo.id = row.id
-      this.salePlanInfo.flag = 2
+      this.settledCompanyInfo.id = row.id
+      this.settledCompanyInfo.flag = 2
       this.$confirm(`确定驳回该入驻申请?`, '提示', {
       this.$confirm(`确定驳回该入驻申请?`, '提示', {
         confirmButtonText: '驳回',
         confirmButtonText: '驳回',
         cancelButtonText: '取消',
         cancelButtonText: '取消',
         type: 'warning',
         type: 'warning',
       })
       })
         .then(() => {
         .then(() => {
-          saleexamine(this.salePlanInfo)
+          settledExamine(this.settledCompanyInfo)
             .toPromise()
             .toPromise()
             .then((response) => {
             .then((response) => {
               this.$notify.success({
               this.$notify.success({
@@ -487,7 +650,6 @@ export default {
               this.getList()
               this.getList()
             })
             })
             .catch((response) => {
             .catch((response) => {
-              console.log(response)
               EventBus.$emit('error', response.message)
               EventBus.$emit('error', response.message)
             })
             })
         })
         })
@@ -505,6 +667,26 @@ export default {
       console.log(`当前页: ${val}`)
       console.log(`当前页: ${val}`)
       this.getList()
       this.getList()
     },
     },
+    //标签
+    handleClose(tag) {
+      this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1)
+    },
+
+    showInput() {
+      this.inputVisible = true
+      this.$nextTick((_) => {
+        this.$refs.saveTagInput.$refs.input.focus()
+      })
+    },
+
+    handleInputConfirm() {
+      let label = this.label
+      if (label) {
+        this.dynamicTags.push(label)
+      }
+      this.inputVisible = false
+      this.label = ''
+    },
   },
   },
 }
 }
 </script>
 </script>
@@ -616,6 +798,21 @@ export default {
   width: 30%;
   width: 30%;
   margin-right: 10px;
   margin-right: 10px;
 }
 }
+.el-tag + .el-tag {
+  margin-left: 10px;
+}
+.button-new-tag {
+  margin-left: 10px;
+  height: 32px;
+  line-height: 30px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+.input-new-tag {
+  width: 90px;
+  margin-left: 10px;
+  vertical-align: bottom;
+}
 .customer .el-form-item {
 .customer .el-form-item {
   border-bottom: 1px solid #ccc;
   border-bottom: 1px solid #ccc;
 }
 }

+ 0 - 1
src/views/salesManagement/salesPlanEdit.vue

@@ -899,7 +899,6 @@ export default {
           })
           })
         })
         })
         .catch(() => {
         .catch(() => {
-          console.log(3523543534)
           return false
           return false
         })
         })
     },
     },