【修改】bug

src/views/deposit_home/components/refund_list-detail.vue

@@ -65,7 +65,7 @@
           <div class="label">移动电话</div>
           <div class="value">
             <el-input
-              :disabled="title == '详情'"
+              :readonly="title == '详情'"
               placeholder="请输入"
               v-model="detailList.refPhone"
             ></el-input>
@@ -119,7 +119,16 @@
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">安装时间</div>
           <div class="value">
-            <el-date-picker prefix-icon="''" placeholder="请选择安装时间" :disabled="title == '详情'" class="selectStyle" v-model="detailList.installDate" type="datetime" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
+            <el-date-picker
+              prefix-icon="''"
+              placeholder="请选择安装时间"
+              :readonly="title == '详情'"
+              class="selectStyle"
+              v-model="detailList.installDate"
+              type="datetime"
+              default-time="00:00:00"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
             </el-date-picker>
           </div>
         </el-col>
@@ -158,141 +167,198 @@
           <div class="label">备注</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input :disabled='detailList.examineStatus !== "WAIT"' v-model="detailList.remark" placeholder="请输入内容"></el-input>
+            <el-input
+              :readonly="detailList.examineStatus !== 'WAIT'"
+              v-model="detailList.remark"
+              placeholder="请输入内容"
+            ></el-input>
           </div>
         </el-col>
         <el-col v-if="!isCustomer" :xs="24" :sm="24" :lg="16" class="item">
           <div class="label">格力内部备注</div>
           <!-- <div class="value">{{  detailList.geLiInerNote}}</div> -->
           <div class="value">
-            <el-input :disabled='detailList.examineStatus !== "WAIT"' v-model="detailList.geLiInerNote" placeholder="请输入内容"></el-input>
+            <el-input
+              :readonly="detailList.examineStatus !== 'WAIT'"
+              v-model="detailList.geLiInerNote"
+              placeholder="请输入内容"
+            ></el-input>
           </div>
-
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">提交保证函</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input readonly  v-model="detailList.remark" ></el-input>
+            <el-input
+              readonly
+              v-model="detailList.refPromiseProvide"
+            ></el-input>
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">跟进函备注</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input  readonly v-model="detailList.remark" ></el-input>
+            <el-input
+              readonly
+              v-model="detailList.refFollowAcceptRemark"
+            ></el-input>
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">资料提交日期</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input  readonly v-model="detailList.remark" ></el-input>
+            <el-date-picker
+              prefix-icon="''"
+              placeholder="请选择安装时间"
+              class="selectStyle"
+              v-model="detailList.refDatumProvideDate"
+              type="datetime"
+              default-time="00:00:00"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
+            </el-date-picker>
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">大额工程</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input  readonly v-model="detailList.remark" ></el-input>
+            <el-select
+              v-model="detailList.refIsBigAmounts"
+              v
+              clearable
+              filterable
+            >
+              <el-option label="是" value="是"> </el-option>
+              <el-option label="否" value="否"> </el-option>
+            </el-select>
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">合同变更批复结果</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input  readonly v-model="detailList.remark" ></el-input>
+            <el-input
+              readonly
+              v-model="detailList.refContractResult"
+            ></el-input>
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">工程机转零售批复结果</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input  readonly v-model="detailList.remark" ></el-input>
+            <el-input
+              readonly
+              v-model="detailList.refToRetailResult"
+            ></el-input>
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">资料延期批复结果</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input  readonly v-model="detailList.remark" ></el-input>
+            <el-input
+              readonly
+              v-model="detailList.refDataDelayResult"
+            ></el-input>
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">其他附件批复结果</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input  readonly v-model="detailList.remark" ></el-input>
+            <el-input
+              readonly
+              v-model="detailList.refOtherAnnexResult"
+            ></el-input>
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">保证函受理状态</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input  readonly v-model="detailList.remark" ></el-input>
+            <el-input
+              readonly
+              v-model="detailList.refPromiseAcceptStatus"
+            ></el-input>
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">保证函备注</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input  readonly v-model="detailList.remark" ></el-input>
+            <el-input
+              readonly
+              v-model="detailList.refPromisePriceRemark"
+            ></el-input>
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">附件备注</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input  readonly v-model="detailList.remark" ></el-input>
+            <el-input
+              readonly
+              v-model="detailList.refFjShenPiRemark"
+            ></el-input>
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">资料状态</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input  readonly v-model="detailList.remark" ></el-input>
+            <el-input readonly v-model="detailList.refDatumProvide"></el-input>
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">资料审核结果</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input  readonly v-model="detailList.remark" ></el-input>
+            <el-input
+              readonly
+              v-model="detailList.refDatumAcceptStatus"
+            ></el-input>
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">合同变更批复意见</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input  readonly v-model="detailList.remark" ></el-input>
+            <el-input readonly v-model="detailList.refContractIdea"></el-input>
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">工程机转零售批复意见</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input  readonly v-model="detailList.remark" ></el-input>
+            <el-input readonly v-model="detailList.refToRetailIdea"></el-input>
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">资料延期批复意见</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input  readonly v-model="detailList.remark" ></el-input>
+            <el-input readonly v-model="detailList.refDataDelayIdea"></el-input>
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">其他附件审批</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input  readonly v-model="detailList.remark" ></el-input>
+            <el-input
+              readonly
+              v-model="detailList.refOtherAnnexIdea"
+            ></el-input>
           </div>
         </el-col>
         <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">寄厂日期</div>
           <div class="value">
             <el-date-picker
-              :disabled="title == '详情'"
+              :readonly="title == '详情'"
               class="selectStyle"
               v-model="detailList.sendFactoryDate"
               type="datetime"
@@ -327,35 +393,32 @@
             show-summary
             :summary-method="$getSummaries"
           >
-
-
-              <template v-if="!isCustomer">
-
-                     <el-table-column
-              align="left"
-              label="厂编号"
-              prop="factoryNo"
-              min-width="160"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.factoryNo" />
-                <span>{{scope.row.factoryNo}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              align="left"
-              label="物料编码"
-              prop="materialNumber"
-              min-width="160"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialNumber" />
-                <span>{{scope.row.materialNumber}}</span>
-              </template>
-            </el-table-column>
-              </template>
+            <template v-if="!isCustomer">
+              <el-table-column
+                align="left"
+                label="厂编号"
+                prop="factoryNo"
+                min-width="160"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">
+                  <CopyButton :copyText="scope.row.factoryNo" />
+                  <span>{{ scope.row.factoryNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                align="left"
+                label="物料编码"
+                prop="materialNumber"
+                min-width="160"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">
+                  <CopyButton :copyText="scope.row.materialNumber" />
+                  <span>{{ scope.row.materialNumber }}</span>
+                </template>
+              </el-table-column>
+            </template>
 
             <el-table-column
               align="left"
@@ -366,7 +429,7 @@
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialOldNumber" />
-                <span>{{scope.row.materialOldNumber}}</span>
+                <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -378,7 +441,7 @@
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialName" />
-                <span>{{scope.row.materialName}}</span>
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -390,7 +453,7 @@
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
-                <span>{{scope.row.specification}}</span>
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -400,9 +463,9 @@
               min-width="160"
               show-overflow-tooltip
             >
-             <template slot-scope="scope">
-                {{ scope.row.price | numToFixed}}
-            </template>
+              <template slot-scope="scope">
+                {{ scope.row.price | numToFixed }}
+              </template>
             </el-table-column>
             <el-table-column
               align="right"
@@ -419,8 +482,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.totalAmount | numToFixed}}
-            </template>
+                {{ scope.row.totalAmount | numToFixed }}
+              </template>
             </el-table-column>
             <el-table-column
               align="right"
@@ -443,10 +506,9 @@
               min-width="160"
               show-overflow-tooltip
             >
-             <template slot-scope="scope">
-                {{ scope.row.depositAmount | numToFixed}}
-            </template>
-
+              <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed }}
+              </template>
             </el-table-column>
             <el-table-column
               align="right"
@@ -455,21 +517,26 @@
               min-width="160"
               show-overflow-tooltip
             >
-             <template slot-scope="scope">
-              <template v-if="detailList.examineStatus !== 'WAIT'" >
-                {{scope.row.contractPrice}}
+              <template slot-scope="scope">
+                <template v-if="detailList.examineStatus !== 'WAIT'">
+                  {{ scope.row.contractPrice }}
+                </template>
+                <el-input
+                  v-else
+                  class="inpt"
+                  v-model="scope.row.contractPrice"
+                  size="mini"
+                  clearable
+                ></el-input>
               </template>
-              <el-input v-else class="inpt" v-model="scope.row.contractPrice"  size="mini" clearable></el-input>
-            </template>
-
             </el-table-column>
-<!--            <el-table-column-->
-<!--              align="right"-->
-<!--              label="上交资料"-->
-<!--              prop="dataQty"-->
-<!--              min-width="160"-->
-<!--              show-overflow-tooltip-->
-<!--            />-->
+            <!--            <el-table-column-->
+            <!--              align="right"-->
+            <!--              label="上交资料"-->
+            <!--              prop="dataQty"-->
+            <!--              min-width="160"-->
+            <!--              show-overflow-tooltip-->
+            <!--            />-->
             <el-table-column
               align="right"
               label="收差全额"
@@ -477,9 +544,9 @@
               min-width="160"
               show-overflow-tooltip
             >
-             <template slot-scope="scope">
-                {{ scope.row.diffAmount | numToFixed}}
-            </template>
+              <template slot-scope="scope">
+                {{ scope.row.diffAmount | numToFixed }}
+              </template>
             </el-table-column>
           </el-table>
         </div>
@@ -487,35 +554,111 @@
     </div>
 
     <h3 class="gdzl">工程资料</h3>
-    <el-button :disabled="isDis" class="batchDownload" type="primary" size="small" @click="batchDownloadFn">批量下载</el-button>
+    <el-button
+      :readonly="isDis"
+      class="batchDownload"
+      type="primary"
+      size="small"
+      @click="batchDownloadFn"
+      >批量下载</el-button
+    >
 
     <el-divider></el-divider>
 
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
-        <el-table v-loading="listLoading" :data="detailList.dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
-          <el-table-column align="left" label="资料描述" prop="dataDescribe" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="原文件名" prop="fileName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="缩略图" prop="fileUrl" min-width="160" show-overflow-tooltip>
+        <el-table
+          v-loading="listLoading"
+          :data="detailList.dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            align="left"
+            label="资料描述"
+            prop="dataDescribe"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="原文件名"
+            prop="fileName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="缩略图"
+            prop="fileUrl"
+            min-width="160"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-              <el-image ref="img" :src="imageURL + scope.row.fileUrl" v-if="checkFileType(scope.row.fileUrl) == 'image'" style="width: 120px; height: 120px" fit="cover" :preview-src-list="[imageURL + scope.row.fileUrl]">
+              <el-image
+                ref="img"
+                :src="imageURL + scope.row.fileUrl"
+                v-if="checkFileType(scope.row.fileUrl) == 'image'"
+                style="width: 120px; height: 120px"
+                fit="cover"
+                :preview-src-list="[imageURL + scope.row.fileUrl]"
+              >
               </el-image>
-              <img class="file" src="@/assets/common/word.png" v-if="checkFileType(scope.row.fileUrl) == 'word'" />
-              <img class="file" src="@/assets/common/excel.png" v-if="checkFileType(scope.row.fileUrl) == 'excel'" />
-              <img class="file" src="@/assets/common/ppt.png" v-if="checkFileType(scope.row.fileUrl) == 'ppt'" />
-              <img class="file" src="@/assets/common/pdf.png" v-if="checkFileType(scope.row.fileUrl) == 'pdf'" />
-              <img v-if="checkFileType(scope.row.fileUrl) == 'file'" class="file aaa" src="@/assets/common/zip.jpeg" />
+              <img
+                class="file"
+                src="@/assets/common/word.png"
+                v-if="checkFileType(scope.row.fileUrl) == 'word'"
+              />
+              <img
+                class="file"
+                src="@/assets/common/excel.png"
+                v-if="checkFileType(scope.row.fileUrl) == 'excel'"
+              />
+              <img
+                class="file"
+                src="@/assets/common/ppt.png"
+                v-if="checkFileType(scope.row.fileUrl) == 'ppt'"
+              />
+              <img
+                class="file"
+                src="@/assets/common/pdf.png"
+                v-if="checkFileType(scope.row.fileUrl) == 'pdf'"
+              />
+              <img
+                v-if="checkFileType(scope.row.fileUrl) == 'file'"
+                class="file aaa"
+                src="@/assets/common/zip.jpeg"
+              />
             </template>
           </el-table-column>
-          <el-table-column align="left" label="下载文件名称" prop="fileName" min-width="160" show-overflow-tooltip>
+          <el-table-column
+            align="left"
+            label="下载文件名称"
+            prop="fileName"
+            min-width="160"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
               {{ "资料_" + scope.row.fileName }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip>
+          <el-table-column
+            align="center"
+            label="操作"
+            min-width="160"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-              <el-button type="text" class="textColor" @click="downLoadFn(scope.row.fileUrl,scope.row.fileName)">下载</el-button>
+              <el-button
+                type="text"
+                class="textColor"
+                @click="downLoadFn(scope.row.fileUrl, scope.row.fileName)"
+                >下载</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -544,34 +687,88 @@
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
-        <el-table v-loading="listLoading" :data="detailList.checkRecordItems" element-loading-text="Loading" border fit highlight-current-row stripe>
-          <el-table-column align="left" label="申请人" prop="submitName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="申请日期" prop="submitTime" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="申请说明" prop="applyNote" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="验收人" prop="checkName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="受理日期" prop="checkDate" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="验收说明" prop="checkNote" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="审批结果" prop="isRefundDeposit" min-width="160" show-overflow-tooltip>
+        <el-table
+          v-loading="listLoading"
+          :data="detailList.checkRecordItems"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            align="left"
+            label="申请人"
+            prop="submitName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="申请日期"
+            prop="submitTime"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="申请说明"
+            prop="applyNote"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="验收人"
+            prop="checkName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="受理日期"
+            prop="checkDate"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="验收说明"
+            prop="checkNote"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="审批结果"
+            prop="isRefundDeposit"
+            min-width="160"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-              {{scope.row.isRefundDeposit == false?'否':'是'}}
+              {{ scope.row.isRefundDeposit == false ? "否" : "是" }}
             </template>
           </el-table-column>
         </el-table>
       </div>
     </div>
 
-    <h3 v-if="
+    <h3
+      v-if="
         detailList.examineStatus == 'WAIT' ||
         detailList.examineStatus == 'FAIL' ||
         detailList.examineStatus == 'OK'
-      ">
+      "
+    >
       审批
     </h3>
-    <el-divider v-if="
+    <el-divider
+      v-if="
         detailList.examineStatus == 'WAIT' ||
         detailList.examineStatus == 'FAIL' ||
         detailList.examineStatus == 'OK'
-      "></el-divider>
+      "
+    ></el-divider>
     <div v-if="detailList.examineStatus == 'WAIT'" class="diy-table-1">
       <el-row :gutter="0">
         <el-col :xs="12" :sm="12" :lg="12" class="item">
@@ -581,7 +778,15 @@
         <el-col :xs="12" :sm="12" :lg="12" class="item dateS">
           <div class="label">受理日期</div>
           <div class="value">
-            <el-date-picker disabled prefix-icon="''" class="selectStyle" type="datetime" placeholder="系统自动生成" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
+            <el-date-picker
+              readonly
+              prefix-icon="''"
+              class="selectStyle"
+              type="datetime"
+              placeholder="系统自动生成"
+              default-time="00:00:00"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
             </el-date-picker>
           </div>
         </el-col>
@@ -603,9 +808,12 @@
       </el-row>
     </div>
 
-    <div v-if="
+    <div
+      v-if="
         detailList.examineStatus == 'OK' || detailList.examineStatus == 'FAIL'
-      " class="diy-table-1">
+      "
+      class="diy-table-1"
+    >
       <el-row :gutter="0">
         <el-col :xs="12" :sm="12" :lg="12" class="item">
           <div class="label">验收人</div>
@@ -614,7 +822,16 @@
         <el-col :xs="12" :sm="12" :lg="12" class="item dateS">
           <div class="label">受理日期</div>
           <div class="value">
-            <el-date-picker disabled prefix-icon="''" class="selectStyle" v-model="detailList.checkDate" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
+            <el-date-picker
+              readonly
+              prefix-icon="''"
+              class="selectStyle"
+              v-model="detailList.checkDate"
+              type="datetime"
+              placeholder=""
+              default-time="00:00:00"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
             </el-date-picker>
           </div>
         </el-col>
@@ -622,21 +839,28 @@
           <div class="label">是否退押</div>
           <div class="value">
             <el-radio-group v-model="detailList.isRefundDeposit">
-              <el-radio disabled :label="true">是</el-radio>
-              <el-radio disabled :label="false">否</el-radio>
+              <el-radio readonly :label="true">是</el-radio>
+              <el-radio readonly :label="false">否</el-radio>
             </el-radio-group>
           </div>
         </el-col>
         <el-col :xs="12" :sm="24" :lg="24" class="item dateS">
           <div class="label">验收说明</div>
           <div class="value">
-            <el-input disabled v-model="detailList.checkNote" placeholder="请输入内容"></el-input>
+            <el-input
+              readonly
+              v-model="detailList.checkNote"
+              placeholder="请输入内容"
+            ></el-input>
           </div>
         </el-col>
         <el-col :xs="12" :sm="24" :lg="24" class="item dateS">
           <div class="label">审批通过后备注</div>
           <div class="value">
-            <el-input v-model="detailList.examineAfterRemark" placeholder="请输入内容"></el-input>
+            <el-input
+              v-model="detailList.examineAfterRemark"
+              placeholder="请输入内容"
+            ></el-input>
           </div>
         </el-col>
       </el-row>
@@ -646,9 +870,27 @@
     <!-- detailList.examineStatus != 'OK' || detailList.examineStatus != 'FAIL' -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button v-if="detailList.examineStatus == 'WAIT'" type="primary" size="small" @click="adoptFn">审批通过</el-button>
-        <el-button v-if="detailList.examineStatus == 'WAIT'" type="primary" size="small" @click="rejectFn">审批驳回</el-button>
-        <el-button v-if="detailList.examineStatus == 'OK'" type="primary" size="small" @click="saveFn">保存</el-button>
+        <el-button
+          v-if="detailList.examineStatus == 'WAIT'"
+          type="primary"
+          size="small"
+          @click="adoptFn"
+          >审批通过</el-button
+        >
+        <el-button
+          v-if="detailList.examineStatus == 'WAIT'"
+          type="primary"
+          size="small"
+          @click="rejectFn"
+          >审批驳回</el-button
+        >
+        <el-button
+          v-if="detailList.examineStatus == 'OK'"
+          type="primary"
+          size="small"
+          @click="saveFn"
+          >保存</el-button
+        >
       </div>
     </div>
   </div>
@@ -874,16 +1116,22 @@ export default {
       } else {
         this.isDis = false;
       }
-      let arr = []
+      let arr = [];
       res.data.items.forEach((item) => {
-        if (Number(item.qty)>0) {
-              arr.push(item)
-            }
+        if (Number(item.qty) > 0) {
+          arr.push(item);
+        }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
         item.sums1 = ["orderHasSendQty", "dataQty", "qty"];
-        item.sums2 = ["totalAmount", "diffAmount", "price",'depositAmount','contractPrice'];
+        item.sums2 = [
+          "totalAmount",
+          "diffAmount",
+          "price",
+          "depositAmount",
+          "contractPrice",
+        ];
       });
-      res.data.items = arr
+      res.data.items = arr;
       this.detailList = res.data;
       if (
         res.data.examineStatus == "SAVE" ||
@@ -901,11 +1149,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .inpt{
-    ::v-deep .el-input__inner{
-      text-align: right ;
-
-    }
+.inpt {
+  ::v-deep .el-input__inner {
+    text-align: right;
+  }
 }
 .aaa {
   height: 64px;
@@ -932,5 +1179,4 @@ export default {
 .selectStyle {
   width: 100%;
 }
-
 </style>

src/views/finance/receivable_list.vue

@@ -113,6 +113,7 @@
                 {{ scope.row.totalAmount | numToFixed }}
               </template>
             </el-table-column>
+            <el-table-column align="left" label="项目费用名称" prop="projectName" min-width="160" show-overflow-tooltip></el-table-column>
 
             <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip fixed="right">
               <template slot-scope="scope">
@@ -274,7 +275,7 @@ export default {
     },
     selectionChangeFn(value) {
       // console.log(value);
-      const res = value.map((v) => v.id);
+      const res = value.map((v) => v.itemId);
       // console.log(res);
       this.deleList = res;
     },

src/views/supply/policy/components/retail_form.vue

@@ -485,8 +485,21 @@
             备注：{{ factor[0].remark }}
           </el-row>
           <el-row :gutter="20">
+            <el-col :xs="24" :sm="8" :lg="11">
+              <el-form-item label="规格型号">
+                <div style="display:flex">
+                  <el-input
+                  v-model="screenForm.specification"
+                  placeholder="请输入型号规格型号"
+                />
+                <el-button type="primary" size="mini" @click="handleGetPolicyList">查询</el-button>
+
+                </div>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="12" :lg="11">
               <el-form-item label="销售政策" class="myselect">
+
                 <el-select
                   v-model="screenForm.policyId"
                   placeholder="选择销售政策"
@@ -511,14 +524,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="8" :lg="11">
-              <el-form-item label="型号">
-                <el-input
-                  v-model="screenForm.specification"
-                  placeholder="请输入型号"
-                />
-              </el-form-item>
-            </el-col>
+
             <el-col :xs="24" :sm="12" :lg="11">
               <el-form-item label="销售类型">
                 <el-select
@@ -1204,6 +1210,9 @@ export default {
       this.screenForm.policyId = data.policyId;
       this.policyConditionId = data.id;
     },
+    handleGetPolicyList(){
+
+    },
     // 引用销售政策搜索
     async handlePolicyTypeList() {
       if (!this.screenForm.policyId) {