Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/api/V2/platformaudit/index.js

@@ -2,7 +2,7 @@
 export const API_POST_GRAINMERCHANTREVIEW = '/identityAuthenticationInfo/api/examine'
 //司机审核
 export const API_POST_DRIVERREVIEW = '/driverViewInfo/api/examine'
-//交易信息审核
+//交易信息审核(采购)
 export const API_POST_TRANSACTIONINFORMATIONREVIEW = '/procurementPlanInfo/api/examine'
 //粮商列表
 export const API_GET_GRAINMERCHANT_LIST = '/identityAuthenticationInfo/selectIdentityAuthenticationInfoPc'
@@ -18,3 +18,22 @@ export const API_GET_SALE_LIST = '/salePlanInfo/selectSalePlanInfo'
 export const API_POST_DELETESALE = '/salePlanInfo/api/deleteSalePlanInfo'
 //交易信息审核(销售)
 export const API_POST_SALEREVIEW = '/salePlanInfo/api/examine'
+//粮脉动态审核(列表)
+export const API_GET_DYNAMICS_LIST = '/settledCompanyDynamics/selectSettledCompanyDynamicsPage'
+//粮脉动态审核(查看)
+export const API_GET_DYNAMICS_LOOK = '/settledCompanyDynamics/getSettledCompanyDynamics'
+//粮脉动态审核(删除)
+export const API_POST_DYNAMICS_DELETE = '/settledCompanyDynamics/api/deleteSettledCompanyInfo'
+//粮脉动态审核
+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'
+

src/model/platformaudit/index.js

@@ -11,6 +11,15 @@ import {
     API_GET_SALE_LIST,
     API_POST_DELETESALE,
     API_POST_SALEREVIEW,
+    API_GET_DYNAMICS_LIST,
+    API_GET_DYNAMICS_LOOK,
+    API_POST_DYNAMICS_DELETE,
+    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'
 // import { app } from 'electron'
 // 粮商审核
@@ -32,4 +41,22 @@ export const saleList = appRx.get(API_GET_SALE_LIST, errorCatcher, errorHandle,
 // 销售交易信息删除
 export const deletesale = appRx.post(API_POST_DELETESALE, errorCatcher, errorHandle, filter)
 // 销售交易信息审核
-export const saleexamine = appRx.post(API_POST_SALEREVIEW, errorCatcher, errorHandle, filter)
+export const saleexamine = appRx.post(API_POST_SALEREVIEW, errorCatcher, errorHandle, filter)
+// 粮脉动态审核(列表)
+export const dynamicsList = appRx.get(API_GET_DYNAMICS_LIST, errorCatcher, errorHandle, filter)
+// 粮脉动态审核(查看)
+export const dynamicsLook = appRx.get(API_GET_DYNAMICS_LOOK, 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 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)

src/views/contractManagement/futuresPurchaseContract.vue

@@ -531,8 +531,6 @@ export default {
           'warning',
           this.$t('system.noticeCircular.NoInformation')
         )
-      } else {
-        this.accessoryTFs = true
       }
       this.appendixIdss = row.addressUrl.split(',')
     },

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -1057,7 +1057,7 @@ export default {
         })
         return
       }
-      if (!this.deptBudgetList.basisPrice) {
+      if (!String(this.deptBudgetList.basisPrice)) {
         this.$message({
           message: '请输入基差！',
           type: 'warning',

src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -1192,7 +1192,7 @@ export default {
         })
         return
       }
-      if (!this.deptBudgetList.basisPrice) {
+      if (!String(this.deptBudgetList.basisPrice) ) {
         this.$message({
           message: '请输入基差！',
           type: 'warning',

src/views/contractManagement/futuresSalesContractAdd.vue

@@ -1035,7 +1035,7 @@ export default {
         })
         return
       }
-      if (!this.deptBudgetList.basisPrice) {
+      if (!String(this.deptBudgetList.basisPrice)) {
         this.$message({
           message: '请输入基差！',
           type: 'warning',

src/views/contractManagement/futuresSalesContractEdit.vue

@@ -1156,7 +1156,7 @@ export default {
         })
         return
       }
-      if (!this.deptBudgetList.basisPrice) {
+      if (!String(this.deptBudgetList.basisPrice)) {
         this.$message({
           message: '请输入基差！',
           type: 'warning',

src/views/platformaudit/grainPulseDynamic.vue

@@ -44,7 +44,7 @@
     <div class="container">
       <el-table
         class="wenzi"
-        :data="tranManagementList.records"
+        :data="dynamicsList.records"
         style="width: 100%"
         height="680"
       >
@@ -54,11 +54,10 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="salePlanNo" label="昵称"> </el-table-column>
-        <el-table-column prop="seller" label="账号"></el-table-column>
-        <el-table-column prop="goodsName" label="发布主体"> </el-table-column>
-        <el-table-column prop="plannedSaleVolume" label="标题">
-        </el-table-column>
+        <el-table-column prop="userName" label="昵称"> </el-table-column>
+        <el-table-column prop="phone" label="账号"></el-table-column>
+        <el-table-column prop="compName" label="发布主体"> </el-table-column>
+        <el-table-column prop="title" label="标题"> </el-table-column>
         <el-table-column prop="updateDate" label="更新时间" width="140">
         </el-table-column>
         <el-table-column prop="" label="操作" width="180">
@@ -80,22 +79,21 @@
           </template>
         </el-table-column>
         <el-table-column prop="address" label="审核">
+          <!-- class="record"
+           class="record" -->
           <template slot-scope="scope">
             <el-button
               size="medium"
-              type="text"
-              class="record"
+              type="danger"
               v-if="scope.row.statusFlag == 1"
-              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
-              @click="reject(scope.row)"
+              @click="rejectList(scope.row)"
               >驳回</el-button
             >
             <el-button
               size="medium"
-              type="text"
-              class="record"
+              type="primary"
               v-if="scope.row.statusFlag == 1"
-              @click="adopt(scope.row)"
+              @click="adoptList(scope.row)"
               v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
               >通过</el-button
             >
@@ -121,48 +119,49 @@
     </div>
     <!--动态信息-->
     <el-dialog
-      width="30%"
+      width="40%"
       title="查看动态信息"
       :visible.sync="dialogFormVisible"
       :append-to-body="true"
     >
-      <el-form class="customer" :model="form">
+      <el-form class="customer"  :model="form">
         <el-form-item label="发布主体" :label-width="formLabelWidth">
-          {{ 111111 }}
+          {{ SettledCompanyDynamicsList.compName }}
         </el-form-item>
         <el-form-item label="标题" :label-width="formLabelWidth">
-          {{ 11111111 }}
+          {{ SettledCompanyDynamicsList.title }}
         </el-form-item>
         <el-form-item label="内容" :label-width="formLabelWidth">
-          <el-input>{{ 111111111 }}</el-input>
+          {{ SettledCompanyDynamicsList.content }}
+        </el-form-item>
+        <el-form-item label="定位" :label-width="formLabelWidth">
+          {{ SettledCompanyDynamicsList.city }}
         </el-form-item>
-          <el-form-item label="定位" :label-width="formLabelWidth">
-          <span>营口市</span>
+        <el-form-item label="附件" :label-width="formLabelWidth">
+          <div :key="index" v-for="(item, index) in SettledCompanyDynamicsList.address">
+          <img style="float:left" v-if="item" :src="item" class="avatar">
+          </div>
         </el-form-item>
-        <!-- <img width="100%" :src="customerlist.cardAddressUrl2" alt />
-        <img width="100%" :src="customerlist.cardAddressUrl2" alt />
-        <img width="100%" :src="customerlist.cardAddressUrl2" alt />
-        <img width="100%" :src="customerlist.cardAddressUrl2" alt />
-        <img width="100%" :src="customerlist.cardAddressUrl2" alt />
-        <img width="100%" :src="customerlist.cardAddressUrl2" alt />
-        <img width="100%" :src="customerlist.cardAddressUrl2" alt />
-        <img width="100%" :src="customerlist.cardAddressUrl2" alt />
-        <img width="100%" :src="customerlist.cardAddressUrl2" alt /> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <!-- <span v-if="scope.row.status == '待审核'"> -->
-          <el-button @click="reject()">驳回</el-button>
-          <el-button @click="adopt()">通过</el-button>
-        <!-- </span>
-        <span v-if="scope.row.status == '已审核'"
+        <span v-if="SettledCompanyDynamicsList.statusFlag == '1'">
+          <el-button @click="reject(id)" type="danger">驳回</el-button>
+          <el-button @click="adopt(id)" type="primary">通过</el-button>
+        </span>
+        <span v-else-if="SettledCompanyDynamicsList.statusFlag != '1'"
           ><el-button @click="dialogFormVisible = fase">关闭</el-button>
-        </span> -->
+        </span>
       </div>
     </el-dialog>
   </div>
 </template>
 <script>
-import { saleList, deletesale, saleexamine } from '@/model/platformaudit/index'
+import {
+  dynamicsList,
+  dynamicsLook,
+  dynamicsDelete,
+  dynamicsExamine,
+} from '@/model/platformaudit/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import { EventBus } from 'base-core-lib'
@@ -204,15 +203,24 @@ export default {
       searchType: 1,
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
-      tranManagementList: [],
-      id:'',
+      dynamicsList: [],
+      pcFlag: 1,
+      formLabelWidth: '120px',
+      form: {},
+      SettledCompanyDynamicsList: {
+        compName: '',
+        title: '',
+        content: '',
+        address: '',
+        city: '',
+      },
       deptBudgetList: {},
       searchTypeList: [
         { value: '待审核', type: 1 },
         { value: '已通过', type: 2 },
         { value: '全部', type: '' },
       ],
-      salePlanInfo: {
+      settledCompanyDynamicsInfo: {
         id: '',
         flag: '',
       },
@@ -250,6 +258,9 @@ export default {
         // }
       })
     },
+    //     close(index) {
+    //   this.addressUrls.splice(index, 1)
+    // },
     //删除
     deleteclick(row) {
       this.$confirm(`动态信息删除后不可恢复，是否确定删除？`, {
@@ -258,7 +269,7 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          deletesale({
+          dynamicsDelete({
             id: row.id,
           })
             .toPromise()
@@ -272,9 +283,18 @@ export default {
     },
     //查看//传参
     nocomplete(row) {
-    this.id = row.id
+      dynamicsLook({
+        id: row.id,
+      })
+        .toPromise()
+        .then((response) => {
+          this.SettledCompanyDynamicsList = response
+           if(response.address!=null){
+          this.SettledCompanyDynamicsList.address=response.address.split(',')
+          }
+          this.id = response.id
+        })
       this.dialogFormVisible = true
-
     },
     //查找
     lookUp() {
@@ -291,16 +311,44 @@ export default {
       this.getList()
     },
     //审核通过
-    adopt() {
-      this.salePlanInfo.id = this.id
-      this.salePlanInfo.flag = 1
+    adopt(id) {
+      this.settledCompanyDynamicsInfo.flag = 1
+      this.settledCompanyDynamicsInfo.id = id
       this.$confirm(`确定通过该动态信息？`, '提示', {
         confirmButtonText: '通过',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
-          saleexamine(this.salePlanInfo)
+          dynamicsExamine(this.settledCompanyDynamicsInfo)
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '通过成功',
+              })
+              this.dialogFormVisible = false
+              this.getList()
+            })
+            .catch((response) => {
+              EventBus.$emit('error', response.message)
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    //列表审核通过
+    adoptList(row) {
+      this.settledCompanyDynamicsInfo.flag = 1
+      this.settledCompanyDynamicsInfo.id = row.id
+      this.$confirm(`确定通过该动态信息？`, '提示', {
+        confirmButtonText: '通过',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          dynamicsExamine(this.settledCompanyDynamicsInfo)
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -318,16 +366,45 @@ export default {
         })
     },
     //审核驳回
-    reject() {
-      this.salePlanInfo.id = this.id
-      this.salePlanInfo.flag = 2
+    reject(id) {
+      this.settledCompanyDynamicsInfo.flag = 2
+      this.settledCompanyDynamicsInfo.id = id
+      this.$confirm(`确定驳回该动态信息？`, '提示', {
+        confirmButtonText: '驳回',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          dynamicsExamine(this.settledCompanyDynamicsInfo)
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '驳回成功',
+              })
+              this.dialogFormVisible = false
+              this.getList()
+            })
+            .catch((response) => {
+              console.log(response)
+              EventBus.$emit('error', response.message)
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    //列表审核驳回
+    rejectList(row) {
+      this.settledCompanyDynamicsInfo.flag = 2
+      this.settledCompanyDynamicsInfo.id = row.id
       this.$confirm(`确定驳回该动态信息？`, '提示', {
         confirmButtonText: '驳回',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
-          saleexamine(this.salePlanInfo)
+          dynamicsExamine(this.settledCompanyDynamicsInfo)
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -380,37 +457,24 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    //销售列表
+    //粮脉动态列表
     getList() {
-      saleList({
-        compId: sessionStorage.getItem('ws-pf_compId'),
+      dynamicsList({
         searchType: this.searchType,
+        // phone: this.phone,
+        pcFlag: this.pcFlag,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchKeyWord: this.searchKeyWord,
       })
         .toPromise()
         .then((response) => {
-          this.tranManagementList = response
+          this.dynamicsList = response
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
         })
     },
-    // fujian(row) {
-    //   if (
-    //     row.receiveAttachmentPath === null ||
-    //     row.receiveAttachmentPath === ''
-    //   ) {
-    //     EventBus.$emit(
-    //       'warning',
-    //       this.$t('system.noticeCircular.NoInformation')
-    //     )
-    //   } else {
-    //     this.accessoryTFs = true
-    //   }
-    //   this.appendixIdss = row.receiveAttachmentPath
-    // },
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleCloe() {
       this.dialogViewSpareMoney = false
@@ -526,7 +590,30 @@ export default {
   width: 30%;
   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 {
+  border-bottom: 1px solid #ccc;
+}
 /deep/.typeselect .el-input__inner {
   color: #8890b1;
 }
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
 </style>

src/views/platformaudit/grainpulseenterprisereview.vue

@@ -54,10 +54,11 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </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>
         <el-table-column prop="" label="操作" width="240">
@@ -127,7 +128,7 @@
       </el-pagination>
       <!--查看-->
       <el-dialog
-        width="30%"
+        width="40%"
         title="查看企业信息"
         :visible.sync="dialogFormVisible1"
         :append-to-body="true"
@@ -135,173 +136,224 @@
         <el-form class="customer" :model="form">
           <h3 style="margin-left: 30px">基本信息</h3>
           <el-form-item label="公司名称" :label-width="formLabelWidth">
-            {{ 111111 }}
+            {{ companyList.compName }}
           </el-form-item>
           <el-form-item label="主营类型" :label-width="formLabelWidth">
-            {{ 111111 }}
+            {{ companyList.mainBusinessType }}
           </el-form-item>
           <el-form-item label="标题" :label-width="formLabelWidth">
-            {{ 111111 }}
+            {{ companyList.title }}
           </el-form-item>
           <el-form-item label="封面简介" :label-width="formLabelWidth">
-            {{ 111111 }}
+            {{ companyList.companyProfile }}
           </el-form-item>
           <el-form-item label="坐标" :label-width="formLabelWidth">
-            {{ 11111 }}
+            <span>经度:{{ companyList.longitude }}</span>
+            <span>纬度:{{ companyList.latitude }}</span>
           </el-form-item>
           <el-form-item label="所在区域" :label-width="formLabelWidth">
-            {{ 111111 }}
+            {{ companyList.province }}{{ companyList.city }}{{ companyList.area }}
           </el-form-item>
           <el-form-item label="详细地址" :label-width="formLabelWidth">
-            {{ 11111111 }}
+            {{ companyList.detailedAddress }}
+          </el-form-item>
+          <el-form-item label="封面图片" :label-width="formLabelWidth">
+            <!-- <img width="50%" :src="companyList.attachmentAddress" alt /> -->
+            <el-image 
+              style="width: 50%"
+              :src="companyList.attachmentAddress" 
+              :preview-src-list="srcList">
+            </el-image>
+          </el-form-item>
+          <el-form-item label="营业执照" :label-width="formLabelWidth">
+            <img width="50%" :src="companyList.licenseAddress" alt />
           </el-form-item>
-          <h4>上传封面图片</h4>
-          <img width="50%" :src="111" alt />
-          <h4>营业执照</h4>
-          <img width="50%" :src="1111" alt />
           <h3 style="margin-left: 30px">附加信息</h3>
           <el-form-item label="企业概况" :label-width="formLabelWidth">
-            {{ 1111111 }}
+            {{ companyList.companyContant }}
           </el-form-item>
           <el-form-item label="标签" :label-width="formLabelWidth">
-            {{ 1111111 }}
+            {{ companyList.label }}
+          </el-form-item>
+          <el-form-item label="场地图片" :label-width="formLabelWidth">
+             <div :key="index" v-for="(item, index) in companyList.sitePhotoAddress">
+              <img style="float:left" v-if="item" :src="item" class="avatar">
+           </div>
           </el-form-item>
-          <h4>场地图片</h4>
-          <img width="50%" :src="1111" alt />
           <h3 style="margin-left: 30px">联系方式</h3>
+          <div
+          v-for="(item, index) in companyList.settledCompanyContacts"
+          :key="index">
           <el-form-item label="联系人" :label-width="formLabelWidth">
-            {{ 11111 }}
+            {{ item.contacts }}
           </el-form-item>
           <el-form-item label="电话" :label-width="formLabelWidth">
-            {{ 1111111 }}
+            {{ item.contactsPhone }}
           </el-form-item>
+          </div>
           <el-form-item label="邮箱" :label-width="formLabelWidth">
-            {{ 111111 }}
+            {{ companyList.email }}
           </el-form-item>
           <el-form-item label="传真" :label-width="formLabelWidth">
-            {{ 1111111 }}
+            {{ companyList.fax }}
           </el-form-item>
         </el-form>
         <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>
       </el-dialog>
       <!--编辑-->
       <el-dialog
-        width="30%"
+        width="40%"
         title="编辑企业信息"
         :visible.sync="dialogFormVisible2"
         :append-to-body="true"
       >
         <el-form class="" :model="form1">
           <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 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">
+              <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-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 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 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 label="所在区域" :label-width="formLabelWidth">
-            <el-input v-model="form.name"></el-input>
+          <el-form-item label="所在区域" :label-width="formLabelWidth" >
+            {{ companyList1.province }}{{ companyList1.city }}{{ companyList1.area }}
           </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 label="上传封面图片" :label-width="formLabelWidth" prop="attachmentAddress">
+            <el-upload
+            class="avatar-uploader"
+            action="https://www.zthymaoyi.com/upload/admin"
+            :show-file-list="false"
+            :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload">
+            <img v-if="companyList1.attachmentAddress" :src="companyList1.attachmentAddress" class="avatar">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </el-form-item>
+          <el-form-item label="营业执照" :label-width="formLabelWidth" prop="licenseAddress">
+            <el-upload
+            class="avatar-uploader"
+            action="https://www.zthymaoyi.com/upload/admin"
+            :show-file-list="false"
+            :on-success="handleAvatarSuccess1"
+            :before-upload="beforeAvatarUpload">
+            <img v-if="companyList1.licenseAddress" :src="companyList1.licenseAddress" class="avatar">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
           </el-form-item>
-          <h4>上传封面图片</h4>
-          <img width="50%" :src="111" alt />
-          <h4>营业执照</h4>
-          <img width="50%" :src="1111" alt />
           <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" maxlength="300" placeholder="请输入企业概况，如经营项目、产品类型、企业规模等，不超过300字"></el-input>
           </el-form-item>
-          <el-form-item label="标签(标签应突出企业特色，最多6个)" >
-            
+          <el-form-item label="标签(标签应突出企业特色，最多6个)" prop="label" >
+           <el-tag
+              :key="tag"
+              v-for="tag in companyList1.label"
+              closable
+              :disable-transitions="false"
+              @close="handleClose(tag)">
+              {{tag}}
+              </el-tag>
+              <el-input
+              class="input-new-tag"
+              v-if="inputVisible"
+              v-model="label"
+              ref="saveTagInput"
+              maxlength="6"
+              placeholder="请输入标签内容，不超过6个字符"
+              size="medium"
+              @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 label="场地图片(图片清晰，最多9张)" :label-width="formLabelWidth" prop="sitePhotoAddress">
+          <div :key="index" v-for="(item, index) in companyList1.sitePhotoAddress">
+           <img style="float:left" v-if="item" :src="item" class="avatar">
+           </div>
+          <el-upload
+            action="https://www.zthymaoyi.com/upload/admin"
+            :show-file-list="false"
+            :limit="9"
+            :on-success="handlePictureCardPreview"
+            :on-remove="handleRemove"
+          >
+            <i class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+          <!-- <el-dialog :visible.sync="dialogVisible3">
+            <img width="100%" :src="companyList1.sitePhotoAddress" alt="" />
+          </el-dialog> -->
           </el-form-item>
-          <h4>场地图片</h4>
-          <img width="50%" :src="1111" alt />
           <h3 style="margin-left: 30px">联系方式</h3>
-          <div :key="index" v-for="(item, index) in freightspace">
-            <el-form-item label="联系人" :label-width="formLabelWidth">
-                <el-input v-model="form.name"></el-input>
+          
+          <div :key="index" v-for="(item, index) in companyList1.settledCompanyContacts">
+            <el-form-item label="联系人" :label-width="formLabelWidth" prop="contacts">
+              <el-input v-model="item.contacts" placeholder="请输入联系人姓名"></el-input>
             </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="item.contactsPhone" placeholder="请输入联系人电话"></el-input>
             </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>
-          <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 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>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="submit()">提交</el-button>
+          <el-button @click="submit(id)" type="primary">提交</el-button>
         </div>
       </el-dialog>
     </div>
   </div>
 </template>
 <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 WsUpload from '@/components/WsUpload'
 import { EventBus } from 'base-core-lib'
-// const cityOptions = ['粮库', '加工厂', '烘干塔', '饲料厂', '养殖厂', '粮贸', '期货'];
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -318,12 +370,19 @@ export default {
   },
   data() {
     return {
+      //标签
+      dynamicTags: [],
+      inputVisible: false,
+      label: '',
+      //图片
+      dialogImageUrl: '',
+      dialogVisible1: false,
+      dialogVisible2: false,
+      dialogVisible3: false,
+      //弹窗
       dialogFormVisible1: false,
       dialogFormVisible2: false,
       checkboxGroup2: [],
-      // 表格显示数据
-      tableDate: [],
-
       // 是否显示
       showType: true,
       // 年
@@ -336,14 +395,20 @@ export default {
       // 提交类型
       submitType: true,
       size: 10,
-      spanArr: [],
-      warehouseName: '',
+      address:'',
       searchType: 1,
       formLabelWidth: '120px',
-      form: {},
+      form: {
+        
+      },
       form1: {
-        type: [],
+        Type: [],
+        textarea: '',
+
       },
+      srcList: [
+          
+        ],
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       grainList: [],
@@ -353,11 +418,20 @@ export default {
         { value: '未通过', type: 3 },
         { value: '全部', type: '' },
       ],
-      salePlanInfo: {
+      companyList: {
+      },
+      companyList1: {
+        id:'',
+        label:'',
+        attachmentAddress: '',
+        licenseAddress: '',
+        sitePhotoAddress: '',
+      },
+      settledCompanyInfo: {
         id: '',
         flag: '',
       },
-      freightspace: [{  }],
+      freightspace: [{}],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -370,19 +444,57 @@ export default {
     this.showType = this.isShow
   },
   methods: {
-    add() {
-      this.freightspace.push({
+    handleAvatarSuccess(res, file) {
+      this.companyList1.attachmentAddress = file.response.url;
+    },
+    handleAvatarSuccess1(res, file) {
+      this.companyList1.licenseAddress = file.response.url;
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === 'image/jpeg';
+      const isLt2M = file.size / 1024 / 1024 < 2;
 
-      })
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 格式!');
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 2MB!');
+      }
+      return isJPG && isLt2M;
+    },
+    //图片
+    handleRemove(file, fileList) {
+      console.log(file, fileList)
+    },
+    handlePictureCardPreview(res, file) {
+      let url = file.response.url;
+      if(this.companyList1.sitePhotoAddress.length>9){
+         this.$message({
+          message: '最多上传九张图片！',
+          type: 'warning',
+        })
+        return
+      }
+      else{
+          this.companyList1.sitePhotoAddress.push(url)
+      }
+
+    },
+    close(index) {
+      this.addressUrls.splice(index, 1)
+    },
+    //联系人
+    add() {
+      this.companyList1.settledCompanyContacts.push({})
     },
     del(index) {
-      if (this.freightspace.length > 1) {
-        this.freightspace.splice(index, 1)
+      if (this.companyList1.settledCompanyContacts.length > 1) {
+        this.companyList1.settledCompanyContacts.splice(index, 1)
       }
     },
     //列表
     getList() {
-      saleList({
+      settledList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         searchType: this.searchType,
         currentPage: this.currentPage,
@@ -392,6 +504,9 @@ export default {
         .toPromise()
         .then((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.pageSize = response.size
           this.deptBudgetTotal = response.total
@@ -405,7 +520,7 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          deletesale({
+          deleteSettled({
             id: row.id,
           })
             .toPromise()
@@ -418,12 +533,193 @@ export default {
         })
     },
     //查看
-    nocomplete(item) {
-      this.dialogFormVisible1 = true
+    nocomplete(row) {
+      getSettled({ id: row.id })
+        .toPromise()
+        .then((response) => {
+          this.companyList = response
+          if(response.sitePhotoAddress!=null){
+          this.companyList.sitePhotoAddress=response.sitePhotoAddress.split(',')
+          }
+          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
+          if(response.mainBusinessType!=null){
+          this.companyList1.mainBusinessType=response.mainBusinessType.split(',')
+          }
+          if(response.label!=null){
+             this.companyList1.label=response.label.split(',')
+          }
+          else{
+             this.companyList1.label=[]
+          }
+          if(response.sitePhotoAddress!=null){
+          this.companyList1.sitePhotoAddress=response.sitePhotoAddress.split(',')
+          }
+          else{
+             this.companyList1.sitePhotoAddress=[]
+          }
+          if(response.settledCompanyContacts.length==0){
+              this.companyList1.settledCompanyContacts.push({})
+          }
+          this.dialogFormVisible2 = true
+        })
+    },
+    submit(id){
+      if (!this.companyList1.compName) {
+        this.$message({
+          message: '公司名称不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.companyList1.compName.length > 25 ||
+        this.companyList1.compName.length < 2
+      ) {
+        this.$message({
+          message: '公司名称输入错误！',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.companyList1.mainBusinessType.length<2) {
+        this.$message({
+          message: '至少选择一个主营类型',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.companyList1.title) {
+        this.$message({
+          message: '标题不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.companyList1.title.length > 16 ||
+        this.companyList1.title.length < 2
+      ) {
+        this.$message({
+          message: '标题长度2-16个字',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.companyList1.companyProfile) {
+        this.$message({
+          message: '简介不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.companyList1.companyProfile.length > 60 ||
+        this.companyList1.companyProfile.length < 10
+      ) {
+        this.$message({
+          message: '简介长度10-60个字',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.companyList1.detailedAddress) {
+        this.$message({
+          message: '详细地址不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.companyList1.detailedAddress.length > 12 ||
+        this.companyList1.detailedAddress.length < 2
+      ) {
+        this.$message({
+          message: '详细地址2-12个字',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.companyList1.attachmentAddress) {
+        this.$message({
+          message: '封面照片不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.companyList1.licenseAddress) {
+        this.$message({
+          message: '营业执照不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.companyList1.contacts > 10 ||
+        this.companyList1.contacts < 2
+      ) {
+        this.$message({
+          message: '联系人姓名2-10个字',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.companyList1.createPhone.length > 15 ||
+        this.companyList1.createPhone.length < 7
+      ) {
+        this.$message({
+          message: '联系人电话7-15位数字',
+          type: 'warning',
+        })
+        return
+      }
+      // if (
+      //   this.companyList1.fax.length > 20 ||
+      //   this.companyList1.fax.length < 6
+      // ) {
+      //   this.$message({
+      //     message: '传真输入错误',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
+      this.companyList1.id = id
+      this.companyList1.mainBusinessType=this.companyList1.mainBusinessType.toString()
+      this.companyList1.label=this.companyList1.label.toString()
+      this.companyList1.sitePhotoAddress=this.companyList1.sitePhotoAddress.toString()
+      this.$confirm(`确定提交企业信息？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning'
+      })
+      .then(() => {
+          editSettled(this.companyList1)
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '提交成功',
+              })
+              this.dialogFormVisible2 = false
+              this.getList()
+            })
+            .catch((response) => {
+              EventBus.$emit('error', response.message)
+            })
+        })
+        .catch(() => {
+          return false
+        })
     },
     //查找
     lookUp() {
@@ -439,17 +735,71 @@ export default {
       this.currentPage = 1
       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) {
-      this.salePlanInfo.id = row.id
-      this.salePlanInfo.flag = 1
+      this.settledCompanyInfo.id = row.id
+      this.settledCompanyInfo.flag = 1
       this.$confirm(`确定通过该入驻申请？`, '提示', {
         confirmButtonText: '通过',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
-          saleexamine(this.salePlanInfo)
+          settledExamine(this.settledCompanyInfo)
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -459,7 +809,6 @@ export default {
               this.getList()
             })
             .catch((response) => {
-              console.log(response)
               EventBus.$emit('error', response.message)
             })
         })
@@ -469,15 +818,15 @@ export default {
     },
     //审核驳回
     reject(row) {
-      this.salePlanInfo.id = row.id
-      this.salePlanInfo.flag = 2
+      this.settledCompanyInfo.id = row.id
+      this.settledCompanyInfo.flag = 2
       this.$confirm(`确定驳回该入驻申请？`, '提示', {
         confirmButtonText: '驳回',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
-          saleexamine(this.salePlanInfo)
+          settledExamine(this.settledCompanyInfo)
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -487,7 +836,6 @@ export default {
               this.getList()
             })
             .catch((response) => {
-              console.log(response)
               EventBus.$emit('error', response.message)
             })
         })
@@ -505,6 +853,35 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
+    //标签
+    handleClose(tag) {
+      this.companyList1.label.splice(this.companyList1.label.indexOf(tag), 1)
+    },
+
+    showInput() {
+      this.inputVisible = true
+      this.$nextTick((_) => {
+        this.$refs.saveTagInput.$refs.input.focus()
+      })
+    },
+
+    handleInputConfirm() {
+      let label = this.label;
+      if (label) {
+        if(this.companyList1.label.length>5){
+         this.$message({
+          message: '最多添加六个标签！',
+          type: 'warning',
+        })
+        return
+      }
+      else{
+          this.companyList1.label.push(label)
+      }
+      }
+      this.inputVisible = false
+      this.label = ''
+    },
   },
 }
 </script>
@@ -616,10 +993,51 @@ export default {
   width: 30%;
   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: 240px;
+  margin-left: 10px;
+  vertical-align: bottom;
+}
 .customer .el-form-item {
   border-bottom: 1px solid #ccc;
 }
 /deep/.typeselect .el-input__inner {
   color: #8890b1;
 }
+.add{
+  margin-left: 10%;
+}
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
 </style>

src/views/purchasingManagement/purchaseOrderList.vue

@@ -106,8 +106,18 @@
           <span
             v-if="
               scope.row.identification == 'false' &&
-              scope.row.basis &&
-              scope.row.procurementPlanType == '期货'
+              String(scope.row.basis) &&
+              scope.row.procurementPlanType == '期货'&&
+              String(scope.row.basis)>0
+            "
+            >{{'+'+scope.row.basis }}</span
+          >
+           <span
+            v-else-if="
+              scope.row.identification == 'false' &&
+              String(scope.row.basis) &&
+              scope.row.procurementPlanType == '期货'&&
+              String(scope.row.basis)<=0
             "
             >{{scope.row.basis }}</span
           >
@@ -1109,7 +1119,7 @@ export default {
         })
         return
       }
-      if (!row.basis) {
+      if (!String(row.basis)) {
         this.$message({
           message: '基差不能为空！',
           type: 'warning',
@@ -1274,7 +1284,7 @@ export default {
         })
         return
       }
-      if (!this.closePositionList1.closingBasis) {
+      if (!String(this.closePositionList1.closingBasis)) {
         this.$message({
           message: '平仓基差不能为空！',
           type: 'warning',
@@ -1467,7 +1477,7 @@ export default {
         return
       }
       if (
-        !this.aduitlist.basis &&
+        !String(this.aduitlist.basis) &&
         this.aduitlist.procurementPlanType != '现货'
       ) {
         this.$message({
@@ -1516,7 +1526,7 @@ export default {
             (String(this.aduitlist.basis).indexOf('.') + 1) >
             2) ||
         this.aduitlist.basis > 10000 ||
-        this.aduitlist.basis < 1
+        this.aduitlist.basis < 0
       ) {
         this.$message({
           message: '基差输入错误',
@@ -1645,7 +1655,7 @@ export default {
         })
         return
       }
-      if (!this.clinchdeal1.basis) {
+      if (!String(this.clinchdeal1.basis)) {
         this.$message({
           message: '基差不能为空',
           type: 'warning',
@@ -1659,7 +1669,7 @@ export default {
             (String(this.clinchdeal1.basis).indexOf('.') + 1) >
             2) ||
         this.clinchdeal1.basis > 10000 ||
-        this.clinchdeal1.basis < 1
+        this.clinchdeal1.basis < 0
       ) {
         this.$message({
           message: '基差输入错误',

src/views/salesManagement/salesPlanEdit.vue

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

src/views/salesManagement/salesPlanOrderList.vue

@@ -106,10 +106,22 @@
           <span
             v-if="
               !scope.row.basischange &&
-              scope.row.basis &&
-              scope.row.salePlanType == '期货'
+              String(scope.row.basis) &&
+              scope.row.salePlanType == '期货' &&
+              String(scope.row.basis)>0
+              
             "
             >{{ '+'+scope.row.basis }}</span
+          >
+           <span
+            v-else-if="
+              !scope.row.basischange &&
+              String(scope.row.basis) &&
+              scope.row.salePlanType == '期货' &&
+              String(scope.row.basis)<=0
+              
+            "
+            >{{scope.row.basis }}</span
           >
           <input
             v-if="scope.row.basischange"
@@ -126,7 +138,7 @@
           <img
             v-if="
               !scope.row.basischange &&
-              scope.row.basis &&
+              String(scope.row.basis) &&
               scope.row.salePlanType == '期货'
             "
             width="17"
@@ -136,7 +148,7 @@
             @click="editbasis(scope.row)"
             alt=""
           />
-          <span v-if="!scope.row.basis">-</span>
+          <span v-if="!String(scope.row.basis)">-</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -1219,7 +1231,7 @@ export default {
         })
         return
       }
-      if (!this.clinchdeal1.basis) {
+      if (!String(this.clinchdeal1.basis)) {
         this.$message({
           message: '基差不能为空',
           type: 'warning',
@@ -1233,7 +1245,7 @@ export default {
             (String(this.clinchdeal1.basis).indexOf('.') + 1) >
             2) ||
         this.clinchdeal1.basis > 10000 ||
-        this.clinchdeal1.basis < 1
+        this.clinchdeal1.basis < 0
       ) {
         this.$message({
           message: '基差输入错误',
@@ -1346,7 +1358,7 @@ export default {
         })
         return
       }
-      if (!this.closePositionList1.closingBasis) {
+      if (!String(this.closePositionList1.closingBasis)) {
         this.$message({
           message: '平仓基差不能为空！',
           type: 'warning',
@@ -1360,7 +1372,7 @@ export default {
             (String(this.closePositionList1.closingBasis).indexOf('.') + 1) >
             2) ||
         this.closePositionList1.closingBasis > 10000 ||
-        this.closePositionList1.closingBasis < 1
+        this.closePositionList1.closingBasis < 0
       ) {
         this.$message({
           message: '平仓基差输入错误',
@@ -1550,7 +1562,7 @@ export default {
         })
         return
       }
-      if (!this.aduitlist.basis && this.aduitlist.salePlanType == '期货') {
+      if ( !String(this.aduitlist.basis)  && this.aduitlist.salePlanType == '期货') {
         this.$message({
           message: '基差不能为空！',
           type: 'warning',
@@ -1599,7 +1611,7 @@ export default {
             2) ||
         (this.aduitlist.salePlanType == '期货' &&
           this.aduitlist.basis > 10000) ||
-        (this.aduitlist.salePlanType == '期货' && this.aduitlist.basis < 1)
+        (this.aduitlist.salePlanType == '期货' && this.aduitlist.basis < 0)
       ) {
         this.$message({
           message: '基差输入错误',