fix: bug

src/views/commercialEngineering/components/base.vue

@@ -516,6 +516,9 @@ export default {
           ]
         }
         this.center = [this.formData.lnt, this.formData.lat]
+        if (this.module === 'examine' && !this.formData.loginStatus) {
+          this.formData.loginStatus = 'OK'
+        }
         await this.getCallbackPosition(0, this.formData.provinceId, 'province', 'id')
         await this.getCallbackPosition(this.formData.provinceId, this.formData.cityId, 'city', 'id')
         await this.getCallbackPosition(this.formData.cityId, this.formData.areaId, 'area', 'id')
@@ -533,9 +536,7 @@ export default {
         this.formData.customerName = this.customerName
       }
     }
-    if (this.module === 'examine') {
-      this.formData.loginStatus = 'OK'
-    }
+
   },
   methods: {
     // 获取省市区街道

src/views/commercialEngineering/components/model.vue

@@ -94,7 +94,7 @@ export default {
                 size='mini'
                 remote
                 reserve-keyword
-                placeholder='请输入规格型号'
+                placeholder='请输入物料名称'
                 remote-method={e => this.remoteMethod(e, 'name')}
                 loading={this.loading}
               >

src/views/commercialEngineering/components/operate.vue

@@ -253,6 +253,16 @@ export default {
           columnAttributes: {
             label: '跟进状态',
             prop: 'status'
+          },
+          render: (h, { row, column, $index }) => {
+            const obj = {
+              ING: '跟进中', LOSS: '已丢单', SIGN: '签订合同'
+            }
+            return (
+              <div>
+                {obj[row.status]}
+              </div>
+            )
           }
         }
       ]

src/views/commercialEngineering/crossDistrict/crossDistrictkList.vue

@@ -95,8 +95,8 @@ export default {
                         return
                       }
                       for (let index = 0; index < this.recordSelected.length.length; index++) {
-                        if (this.recordSelected[index].orderStatus !== '登录成功') {
-                          this.$message.error('请选择审核通过的数据')
+                        if (this.recordSelected[index].orderStatus !== '登录成功' && this.recordSelected[index].status === '跟进中') {
+                          this.$message.error('请选择审核通过并且跟进中的数据')
                           return
                         }
                       }
@@ -217,7 +217,7 @@ export default {
               编辑
               </el-button> : null
             }
-            {row.orderStatus === 'OK'
+            {row.orderStatus === 'OK' &&  row.status ==='ING'
               ? <el-button size='mini' type='text' onClick={() => {
                 this.operateType = 'update'
                 this.operateTitle = '更新'
@@ -227,7 +227,7 @@ export default {
               更新
               </el-button> : null
             }
-            {!this.isTradeExaminer && ((row.orderStatus === 'WAIT' || row.orderStatus === 'FAIL') && !row.isApplyUpdate) ? (
+            {!this.isTradeExaminer && ((row.orderStatus === 'OK' || row.orderStatus === 'FAIL') && !row.isApplyUpdate) ? (
               <el-button
                 size='mini'
                 type='text'

src/views/commercialEngineering/crossDistrict/examine.vue

@@ -30,7 +30,6 @@ export default {
     onSbumit(type) {
       const params = {
         ...this.formData,
-        orderStatus: 'OK',
         isSpan: true
 
       }

src/views/commercialEngineering/frock/detail.vue

@@ -7,7 +7,7 @@
     <el-form v-show="current === 'detail'" disabled>
       <Base :form-data="formData" page-type="frock" :module="module" :common-data="commonData" />
       <Model :form-data="formData" page-type="frock" :module="module" :common-data="commonData" />
-      <Examine v-if="formData.confirmBy && formData.confirmTime" :form-data="formData" page-type="frock" :module="module" :common-data="commonData" />
+      <Examine v-if=" formData.confirmBy && formData.confirmTime" :form-data="formData" page-type="frock" :module="module" :common-data="commonData" />
     </el-form>
     <OperationRecords v-show="current === 'record'" :detail-id="detailId" />
   </div>

src/views/commercialEngineering/frock/examine.vue

@@ -29,9 +29,9 @@ export default {
     onSbumit() {
       const params = {
         ...this.formData,
-        orderStatus: 'OK'
 
       }
+
       if (params.loginStatus === 'FAIL' && !params.projectNo) {
         this.$errorMsg('请填写项目编号')
         return

src/views/commercialEngineering/frock/frockList.vue

@@ -92,8 +92,8 @@ export default {
                         return
                       }
                       for (let index = 0; index < this.recordSelected.length.length; index++) {
-                        if (this.recordSelected[index].orderStatus !== '登录成功') {
-                          this.$message.error('请选择审核通过的数据')
+                        if (this.recordSelected[index].orderStatus !== '登录成功' && this.recordSelected[index].status === '跟进中') {
+                          this.$message.error('请选择审核通过并且跟进中的数据')
                           return
                         }
                       }
@@ -215,7 +215,7 @@ export default {
               编辑
               </el-button> : null
             }
-            {row.orderStatus === 'OK'
+            {row.orderStatus === 'OK' &&  row.status ==='ING'
               ? <el-button size='mini' type='text' onClick={() => {
                 this.operateType = 'update'
                 this.operateTitle = '更新'
@@ -225,7 +225,7 @@ export default {
               更新
               </el-button> : null
             }
-            {!this.isTradeExaminer && ((row.orderStatus === 'WAIT' || row.orderStatus === 'FAIL') && !row.isApplyUpdate) ? (
+            {!this.isTradeExaminer && ((row.orderStatus === 'OK' || row.orderStatus === 'FAIL') && !row.isApplyUpdate) ? (
               <el-button
                 size='mini'
                 type='text'

src/views/commercialEngineering/homeDecoration/examine.vue

@@ -29,8 +29,7 @@ export default {
   methods: {
     onSbumit(type) {
       const params = {
-        ...this.formData,
-        orderStatus: 'OK'
+        ...this.formData
       }
       if (params.loginStatus === 'FAIL' && !params.projectNo) {
         this.$errorMsg('请填写项目编号')

src/views/commercialEngineering/homeDecoration/homeDecorationList.vue

@@ -103,8 +103,8 @@ export default {
                         return
                       }
                       for (let index = 0; index < this.recordSelected.length.length; index++) {
-                        if (this.recordSelected[index].orderStatus !== '登录成功') {
-                          this.$message.error('请选择审核通过的数据')
+                        if (this.recordSelected[index].orderStatus !== '登录成功' && this.recordSelected[index].status === '跟进中') {
+                          this.$message.error('请选择审核通过并且跟进中的数据')
                           return
                         }
                       }
@@ -225,7 +225,7 @@ export default {
               编辑
               </el-button> : null
             }
-            {row.orderStatus === 'OK'
+            {row.orderStatus === 'OK'&&  row.status ==='ING'
               ? <el-button size='mini' type='text' onClick={() => {
                 this.operateType = 'update'
                 this.operateTitle = '更新'
@@ -235,7 +235,7 @@ export default {
               更新
               </el-button> : null
             }
-            {!this.isTradeExaminer && ((row.orderStatus === 'WAIT' || row.orderStatus === 'FAIL') && !row.isApplyUpdate) ? (
+            {!this.isTradeExaminer && ((row.orderStatus === 'OK' || row.orderStatus === 'FAIL') && !row.isApplyUpdate) ? (
               <el-button
                 size='mini'
                 type='text'