调整

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -46,33 +46,38 @@
             <span v-else>需求日期</span>
           </div>
           <div v-if="scope.column.columnname == 'deliverydate'">
-            <div v-if="siteid === 'NB'">
-              <el-date-picker
-                  style="width:180px"
-                  v-model="value2"
-                  value-format="yyyy-MM-dd"
-                  slot="reference"
-                  align="right"
-                  type="date"
-                  size="mini"
-                  placeholder="一键回复交期"
-                  @change="dateChange">
-              </el-date-picker>
+            <div v-if="data.status === '审核' || data.status === '关闭'">
+              <span>回复交期</span>
             </div>
             <div v-else>
-              <el-date-picker
-                  style="width:180px"
-                  v-if="type === 'confirmdate'"
-                  v-model="value2"
-                  value-format="yyyy-MM-dd"
-                  slot="reference"
-                  align="right"
-                  type="date"
-                  size="mini"
-                  placeholder="一键回复交期"
-                  @change="dateChange">
-              </el-date-picker>
-              <span v-else>回复交期</span>
+              <div v-if="siteid === 'NB'">
+                <el-date-picker
+                    style="width:180px"
+                    v-model="value2"
+                    value-format="yyyy-MM-dd"
+                    slot="reference"
+                    align="right"
+                    type="date"
+                    size="mini"
+                    placeholder="一键回复交期"
+                    @change="dateChange">
+                </el-date-picker>
+              </div>
+              <div v-else>
+                <el-date-picker
+                    style="width:180px"
+                    v-if="type === 'confirmdate'"
+                    v-model="value2"
+                    value-format="yyyy-MM-dd"
+                    slot="reference"
+                    align="right"
+                    type="date"
+                    size="mini"
+                    placeholder="一键回复交期"
+                    @change="dateChange">
+                </el-date-picker>
+                <span v-else>回复交期</span>
+              </div>
             </div>
 
           </div>
@@ -102,22 +107,19 @@
               </div>
           </div>
           <div v-else-if="scope.column.columnname === 'deliverydate'">
-            <div v-if="siteid === 'NB'">
-              <el-date-picker
-                  v-if="scope.column.data.delivery > 0 && type === 'confirmdate'"
-                  v-model="scope.column.data.deliverydate"
-                  type="date"
-                  placeholder="选择日期"
-                  value-format="yyyy-MM-dd"
-                  size="mini"
-                  style="width:150px"
-                  :picker-options="pickerOptions"
-                  @change="onDateChange(scope.column.data)"
-                  @focus="setPickerOptions(scope.column.data)">
-              </el-date-picker>
+            <div v-if="data.status === '审核' || data.status === '关闭'">
+              <div v-if="siteid === 'NB'">
+                <p >{{scope.column.data.deliverydate}}</p>
+              </div>
               <div v-else>
+                <p v-if="scope.column.data.delivery == 0 ">不管控交期</p>
+                <p v-else>{{scope.column.data.deliverydate}}</p>
+              </div>
+            </div>
+            <div v-else>
+              <div v-if="siteid === 'NB'">
                 <el-date-picker
-                    v-if="scope.column.data.delivery == 0"
+                    v-if="scope.column.data.delivery > 0 && type === 'confirmdate'"
                     v-model="scope.column.data.deliverydate"
                     type="date"
                     placeholder="选择日期"
@@ -128,25 +130,39 @@
                     @change="onDateChange(scope.column.data)"
                     @focus="setPickerOptions(scope.column.data)">
                 </el-date-picker>
-                <p v-else>{{scope.column.data.deliverydate}}</p>
+                <div v-else>
+                  <el-date-picker
+                      v-if="scope.column.data.delivery == 0"
+                      v-model="scope.column.data.deliverydate"
+                      type="date"
+                      placeholder="选择日期"
+                      value-format="yyyy-MM-dd"
+                      size="mini"
+                      style="width:150px"
+                      :picker-options="pickerOptions"
+                      @change="onDateChange(scope.column.data)"
+                      @focus="setPickerOptions(scope.column.data)">
+                  </el-date-picker>
+                  <p v-else>{{scope.column.data.deliverydate}}</p>
+                </div>
               </div>
-            </div>
-            <div v-else>
-              <el-date-picker
-                  v-if="scope.column.data.delivery > 0 && type === 'confirmdate'"
-                  v-model="scope.column.data.deliverydate"
-                  type="date"
-                  placeholder="选择日期"
-                  value-format="yyyy-MM-dd"
-                  size="mini"
-                  style="width:150px"
-                  :picker-options="pickerOptions"
-                  @change="onDateChange(scope.column.data)"
-                  @focus="setPickerOptions(scope.column.data)">
-              </el-date-picker>
               <div v-else>
-                <p v-if="scope.column.data.delivery == 0 ">不管控交期</p>
-                <p v-else>{{scope.column.data.deliverydate}}</p>
+                <el-date-picker
+                    v-if="scope.column.data.delivery > 0 && type === 'confirmdate'"
+                    v-model="scope.column.data.deliverydate"
+                    type="date"
+                    placeholder="选择日期"
+                    value-format="yyyy-MM-dd"
+                    size="mini"
+                    style="width:150px"
+                    :picker-options="pickerOptions"
+                    @change="onDateChange(scope.column.data)"
+                    @focus="setPickerOptions(scope.column.data)">
+                </el-date-picker>
+                <div v-else>
+                  <p v-if="scope.column.data.delivery == 0 ">不管控交期</p>
+                  <p v-else>{{scope.column.data.deliverydate}}</p>
+                </div>
               </div>
             </div>
           </div>

src/HManagement/clueManage/clue_private/modules/detail.vue

@@ -26,7 +26,8 @@
         <BaseInfo :detailInfo="detailInfo"/>
       </div>
       <div slot="slot0" class="container normal-panel">
-        <el-descriptions>
+        <followDetail ref="followDetail" :disabled="true"/>
+<!--        <el-descriptions>
           <div slot="title">跟进记录 &nbsp;<i @click="followRecord(param.content.sort[0].reversed = param.content.sort[0].reversed == 1 ? 0 : 1)" :class="param.content.sort[0].reversed == 1?'fa fa-sort-amount-asc':'fa fa-sort-amount-desc'"></i></div>
         </el-descriptions>
         <div class="flex-align-center normal-margin">
@@ -74,7 +75,7 @@
           layout="total, prev, pager, next"
           :total="total">
           </el-pagination>
-        </div>
+        </div>-->
       </div>
       <div slot="slot2" class="container normal-panel">
         <sourceClues></sourceClues>
@@ -84,6 +85,7 @@
 </template>
 
 <script>
+import followDetail from '@/SManagement/orderclue_detail/components/followDetail'
 import BaseInfo from '@/HDrpManagement/projectChange/modules/modules/baseInfo/baseInfo'
 import recall from './recall.vue'
 import edit from './edit'
@@ -133,7 +135,7 @@ export default {
     }
   },
   components:{
-    BaseInfo,recall,edit,distobutionOne,FileItem,sourceClues,changeSite,restore
+    BaseInfo,recall,edit,distobutionOne,FileItem,sourceClues,changeSite,restore,followDetail
   },
   methods:{
     async followRecord () {

src/HManagement/clueManage/clue_public/modules/detail.vue

@@ -27,7 +27,8 @@
         <BaseInfo :detailInfo="detailInfo"/>
       </div>
       <div slot="slot0" class="container normal-panel">
-        <el-descriptions>
+        <followDetail ref="followDetail" :disabled="!isHandle || mainData.status === '已无效' || mainData.status === '已过期'"/>
+<!--        <el-descriptions>
           <div slot="title">跟进记录 &nbsp;<i @click="followRecord(param.content.sort[0].reversed = param.content.sort[0].reversed == 1 ? 0 : 1)" :class="param.content.sort[0].reversed == 1?'fa fa-sort-amount-asc':'fa fa-sort-amount-desc'"></i></div>
         </el-descriptions>
         <div class="flex-align-center normal-margin">
@@ -44,8 +45,8 @@
             size="small"
             @change="dateChange"
             clearable>
-          </el-date-picker>
-        </div>
+          </el-date-picker>-->
+<!--        </div>
         <div class="detail" v-if="recordlist.length > 0">
           <div class="item" v-for="(item,index) in recordlist" :key="index">
             <p>{{index + 1}}.{{item.createdate}},&nbsp;由<span style="font-weight:bold;margin:0 6px;font-size:13px">{{item.createby}}</span>开始跟进,跟进方式:<span style="font-weight:bold;margin:0 5px">{{item.followupmode}}</span>,{{handleTxt[item.logtype]}}</p>
@@ -75,7 +76,7 @@
           layout="total, prev, pager, next"
           :total="total">
           </el-pagination>
-        </div>
+        </div>-->
       </div>
       <div slot="slot2" class="container normal-panel">
         <sourceClues></sourceClues>
@@ -85,6 +86,7 @@
 </template>
 
 <script>
+import followDetail from '@/SManagement/orderclue_detail/components/followDetail'
 import FileItem from '@/SManagement/orderclue/components/file/index2'
 import BaseInfo from '@/HDrpManagement/projectChange/modules/modules/baseInfo/baseInfo'
 import recall from './recall.vue'
@@ -139,7 +141,8 @@ export default {
     distobutionOne,
     sourceClues,
     changeSite,
-    restore
+    restore,
+    followDetail
   },
   methods:{
     handleSizeChange(val) {

src/SManagement/orderclue_detail/components/followDetail.vue

@@ -142,7 +142,8 @@ export default {
         item.attinfo = this.fileType.fileList(item.attinfo)
       })
       this.param.content.sort = res.sort
-      console.log(this.follow);
+      console.log(this.follow,'follow');
+      console.log(this.follow.length,'lengyh');
 
     },
     handleCurrentChange(n) {

src/views/message/index.vue

@@ -139,7 +139,7 @@ export default {
               "messageid":data.messageid
           }
         })
-      /*data.isread = 1*/
+      data.isread = 1
       res.data.name = data.name
       res.data.link = data.link
       res.data.modules = data.modules