【修改】bug

src/views/deposit_commerce/components/deposit-apply-surrender.vue

@@ -49,15 +49,16 @@
               </div>
             </el-col>
           <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label">厂工程编码</div>
+            <div class="label">厂编号</div>
             <div class="value">
-              <el-form-item prop="refFactoryNo">
+               {{ details.refFactoryNo }}
+              <!-- <el-form-item prop="refFactoryNo">
                 <el-input
                   v-model="details.refFactoryNo"
-                  placeholder="厂工程编码"
+                  placeholder="厂编号"
                   size="small"
                 />
-              </el-form-item>
+              </el-form-item> -->
             </div>
           </el-col>
 

src/views/deposit_commerce/components/deposit_list-detail.vue

@@ -87,7 +87,7 @@
               <div class="value">{{ details.refUseUnit }}</div>
             </el-col>
 <el-col :xs="24" :sm="24" :lg="12" class="item">
-              <div class="label">跨区厂编号</div>
+              <div class="label">厂编号</div>
               <div class="value">{{ details.refFactoryNo }}</div>
             </el-col>
             <el-col :xs="24" :sm="24" :lg="24" class="item">
@@ -148,7 +148,7 @@
 
             <el-table-column
               align="left"
-              label="跨区厂编号"
+              label="厂编号"
               prop="factoryNo"
               min-width="160"
               show-overflow-tooltip
@@ -419,7 +419,7 @@
             <div class="value">{{ details.checkBy }}</div>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="12" class="item">
-            <div class="label">验收日期</div>
+            <div class="label">受理日期</div>
             <div class="value">{{ details.checkDate }}</div>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="12" class="item">
@@ -762,7 +762,7 @@
           >
             <el-table-column
               align="left"
-              label="验收日期"
+              label="受理日期"
               prop="checkDate"
               min-width="160"
               show-overflow-tooltip

src/views/deposit_commerce/components/nodeduct_list-detail.vue

@@ -227,7 +227,7 @@
           <div class="value">2022123233435342</div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item">
-          <div class="label">验收日期</div>
+          <div class="label">受理日期</div>
           <div class="value">
             <el-date-picker type="date" placeholder=""> </el-date-picker>
           </div>
@@ -283,4 +283,4 @@ export default {
 .dateStyle {
   width: 100%;
 }
-</style>
+</style>

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

@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">跨区厂编号</div>
+          <div class="label">厂编号</div>
           <div class="value">{{ detailList.refFactoryNo }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
@@ -197,7 +197,7 @@
     <div class="mymain-container">
       <div class="table">
         <el-table v-loading="listLoading" :data="detailList.items" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
-          <el-table-column align="left" label="跨区厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>\
+          <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>
@@ -329,7 +329,7 @@
           <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="checkBy" 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="checkDate" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="是否退押" prop="checkBy" 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>
@@ -360,7 +360,7 @@
           <div class="value">{{ this.checkBy }}</div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item dateS">
-          <div class="label">验收日期</div>
+          <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>
@@ -393,7 +393,7 @@
           <div class="value">{{ detailList.checkBy }}</div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item dateS">
-          <div class="label">验收日期</div>
+          <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>
@@ -702,4 +702,4 @@ export default {
 .selectStyle {
   width: 100%;
 }
-</style>
+</style>

src/views/deposit_commerce/deposit_list.vue

@@ -119,7 +119,7 @@
               </el-form-item>
             </el-col> -->
              <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始验收日期" prop="startConfirmTime">
+              <el-form-item label="开始受理日期" prop="startConfirmTime">
                 <el-date-picker
                   v-model="screenForm.startConfirmTime"
                   class="dateStyle"
@@ -129,7 +129,7 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束验收日期" prop="endConfirmTime">
+              <el-form-item label="结束受理日期" prop="endConfirmTime">
                 <el-date-picker
                   v-model="screenForm.endConfirmTime"
                   class="dateStyle"
@@ -293,7 +293,7 @@
             />
             <el-table-column
               align="left"
-              label="验收日期"
+              label="受理日期"
               prop="checkDate"
               min-width="160"
               show-overflow-tooltip

src/views/deposit_commerce/refund_list.vue

@@ -11,116 +11,227 @@
       <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" label-width="120px" size="mini" label-position="left">
-          <el-row :gutter="10">
+        <el-form
+          ref="screenForm"
+          :model="screenForm"
+          label-width="120px"
+          size="mini"
+          label-position="left"
+        >
+          <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="工程登录编号" prop="refEnginRecordNo">
-                <el-input v-model="searchForm.refEnginRecordNo" placeholder="请输入"></el-input>
+                <el-input
+                  v-model="screenForm.refEnginRecordNo"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编码" prop="customerKeyword">
-                <el-input v-model="searchForm.customerKeyword" placeholder="请输入"></el-input>
+              <el-form-item label="经销商编码/名称" prop="customerKeyword">
+                <el-input
+                  v-model="screenForm.customerKeyword"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商名称" prop="customerKeyword">
                 <el-input
-                  v-model="searchForm.customerKeyword"
+                  v-model="screenForm.customerKeyword"
                   placeholder="请输入"
                 ></el-input>
               </el-form-item>
             </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="使用单位" prop="refProjectName">
-                <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="审核人" prop="confirmName">
-                <el-input v-model="searchForm.confirmName" placeholder="请输入"></el-input>
+              <el-form-item label="使用单位" prop="refUseUnit">
+                <el-input
+                  v-model="screenForm.refUseUnit"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="specification">
-                <el-input v-model="searchForm.specification" placeholder="请输入"></el-input>
+              <el-form-item label="开始申请日期" prop="startSubmitTime">
+                <el-date-picker
+                  v-model="screenForm.startSubmitTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="特价编号" prop="specialNo">
-                <el-input v-model="searchForm.specialNo" placeholder="请输入"></el-input>
+             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="结束申请日期" prop="endSubmitTime">
+                <el-date-picker
+                  v-model="screenForm.endSubmitTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
+
+
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="跨区厂编号" prop="refFactoryNo">
-                <el-input v-model="searchForm.refFactoryNo" placeholder="请输入"></el-input>
+              <el-form-item label="是否退押 " prop="isRefundDeposit">
+                <el-select
+                  style="width: 100%"
+                  v-model="screenForm.isRefundDeposit"
+                  placeholder="请选择是否退押 "
+                >
+                  <el-option label="默认" :value="null"></el-option>
+
+                  <el-option
+                    v-for="item in refundDepositArr"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="安装日期" prop="">
-                <div class="fanwei">
-                  <el-date-picker class="dateStyle" v-model="searchForm.startInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
-                  <span>-</span>
-                  <el-date-picker class="dateStyle" v-model="searchForm.endInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
-                </div>
+              <el-form-item label="状态 " prop="examineStatus">
+                <el-select
+                  style="width: 100%"
+                  v-model="screenForm.examineStatus"
+                  placeholder="请选择状态 "
+                >
+                  <el-option label="默认" :value="null"></el-option>
+
+                  <el-option
+                    v-for="item in examineStatusArr"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
-
             <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始安装日期" prop="startInstallTime">
-                <el-date-picker class="dateStyle" v-model="searchForm.startInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
+              <el-form-item label="产品名称" prop="">
+                <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束安装日期" prop="endInstallTime">
-                <el-date-picker class="dateStyle" v-model="searchForm.endInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
+              <el-form-item label="规格型号" prop="">
+                <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="区域" prop="refRegionWork">
-                <el-input v-model="searchForm.refRegionWork" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货申请开始日期" prop="startDeliverTime">
+             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="开始受理日期" prop="startConfirmTime">
                 <el-date-picker
+                  v-model="screenForm.startConfirmTime"
                   class="dateStyle"
-                  v-model="searchForm.startDeliverTime"
                   type="datetime"
-                  placeholder=""
-                  default-time="00:00:00"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
-                </el-date-picker>
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货申请结束日期" prop="endDeliverTime">
+              <el-form-item label="结束受理日期" prop="endConfirmTime">
                 <el-date-picker
-                  v-model="searchForm.endDeliverTime"
+                  v-model="screenForm.endConfirmTime"
                   class="dateStyle"
                   type="datetime"
-                  placeholder=""
-                  default-time="23:59:59"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col> -->
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品名称" prop="">
-                <el-input placeholder="请输入"></el-input>
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col> -->
+            <template v-if="!isCustomer">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="审核人" prop="confirmName">
+                  <el-input
+                    v-model="screenForm.confirmName"
+                    placeholder="请输入审核人"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="区域" prop="refRegionWork">
+                  <el-input
+                    v-model="screenForm.refRegionWork"
+                    placeholder="请输入区域"
+                  />
+                </el-form-item>
+              </el-col>
+                 <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="安装日期"   style="margin-bottom:0">
+                  <div class="fanwei">
+                     <el-form-item prop="startInstallTime">
+                          <el-date-picker
+                        v-model="screenForm.startInstallTime"
+                        class="dateStyle"
+                        type="datetime"
+                        placeholder="选择日期"
+                      />
+
+                     </el-form-item>
+                      <span>-</span>
+                    <el-form-item prop="endInstallTime">
+                                 <el-date-picker
+                  v-model="screenForm.endInstallTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
+
+                     </el-form-item>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="规格型号" prop="specification">
+                        <el-input  v-model="screenForm.specification" ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="特价编号" prop="specialNo">
+
+                        <el-input  v-model="screenForm.specialNo" ></el-input>
+
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+               <el-form-item label="跨区厂编号" prop="refFactoryNo">
+
+                        <el-input  v-model="screenForm.refFactoryNo" ></el-input>
+
+                </el-form-item>
 
-            <el-col :xs="24" :sm="12" :lg="18">
+              </el-col>
+              <!-- <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="产品编码" >
+                  <div class="fanwei">
+                     <el-form-item prop="startMaterialOldNumber">
+                        <el-input type="startMaterialOldNumber" ></el-input>
+                     </el-form-item>
+
+                  <span>-</span>
+                    <el-form-item prop="endMaterialOldNumber">
+                    <el-input type="endMaterialOldNumber" ></el-input>
+                     </el-form-item>
+                  </div>
+
+                </el-form-item>
+
+
+              </el-col> -->
+
+            </template>
+            <el-col :xs="24" :sm="24" :lg="24">
+             <div class="fl">
+          <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
+            <el-radio-button label="HOME">家用工程</el-radio-button>
+            <el-radio-button label="TRADE">商用工程</el-radio-button>
+          </el-radio-group> -->
+          <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
+        </div>
               <el-form-item label="" class="fr">
-                <el-button size="mini" @click="resetFn">清空</el-button>
+                     <el-button size="mini" @click="resetFn">清空</el-button>
                 <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
               </el-form-item>
             </el-col>
@@ -176,7 +287,7 @@
                 <span>{{scope.row.customerName}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="跨区厂编号" prop="refFactoryNo" min-width="260" show-overflow-tooltip>
+            <el-table-column align="left" label="厂编号" prop="refFactoryNo" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refFactoryNo" />
                 <span>{{scope.row.refFactoryNo}}</span>
@@ -298,18 +409,64 @@ export default {
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
       dataList: [], // 列表数据
-      searchForm: {
-        refEnginRecordNo: "",
-        customerKeyword: "",
-        refProjectName: "",
-        confirmName: "",
-        specification: "",
-        specialNo: "",
-        refFactoryNo: "",
+        screenForm: {
+        confirmName: "", // 审核人
+        createName: "", // 创建人
+        customerKeyword: "", // 客户编码/客户名称
+        endDeliverTime: "", // 发货申请日期-结束
+        enginOrderNo: "", // 工程订单编号
+        enginOrderType: "TRADE", // 工程订单类型
+        examineStatus: "", // 状态
+        refEnginRecordNo: "", // 登录单号
+        refProjectName: "", // 项目名称
+        refUseUnit: "", // 使用单位
+        startDeliverTime: "", // 发货申请日期-开始
+        startSubmitTime: "",
+        startConfirmTime: "",
+        isRefundDeposit: null,
         startInstallTime: "",
+        endConfirmTime: "",
         endInstallTime: "",
+        specification:'',
+        refFactoryNo:'',
+        factoryNo: "",
+        specialNo: "",
         refRegionWork: "",
-      }, //搜索表单
+        endSubmitTime:'',
+      }, // 搜索表单
+       refundDepositArr: [
+        {
+          label: "是",
+          value: true,
+        },
+        {
+          label: "否",
+          value: false,
+        },
+      ],
+
+      examineStatusArr: [
+        {
+          label: "保存",
+          value: "SAVE",
+        },
+        {
+          label: "待审核",
+          value: "WAIT",
+        },
+        {
+          label: "通过",
+          value: "OK",
+        },
+        {
+          label: "不通过",
+          value: "FAIL",
+        },
+        {
+          label: "关闭",
+          value: "CLOSE",
+        },
+      ],
       listLoading: false, // 列表加载loading
       examine: "",
       showSurrender: true,
@@ -321,19 +478,18 @@ export default {
     this.getDataList({
       pageSize: this.pageSize,
       pageNum: this.currentPage,
-      confirmName: "",
-      createName: "",
-      customerKeyword: "",
-      // endDeliverTime: "",
-      enginOrderNo: "",
       enginOrderType: this.enginOrderType,
-      examineStatus: "",
-      refEnginRecordNo: "",
-      refProjectName: "",
-      refUseUnit: "",
+       ...this.screenForm,
       // startDeliverTime: "",
     });
   },
+   computed: {
+    isCustomer() {
+      return (
+        this.$store.getters.customerId && this.$store.getters.customerNumber
+      );
+    },
+  },
   methods: {
     //同步资料日期
     async syncDateFn() {
@@ -366,6 +522,7 @@ export default {
           refEnginRecordNo: "",
           refProjectName: "",
           refUseUnit: "",
+           ...this.screenForm,
           // startDeliverTime: "",
         });
       } else {
@@ -387,6 +544,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
+         ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -409,6 +567,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
+         ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -429,6 +588,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
+         ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -448,6 +608,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
+         ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -457,16 +618,9 @@ export default {
       this.getDataList({
         pageSize: this.pageSize,
         pageNum: this.currentPage,
-        confirmName: "",
-        createName: "",
-        customerKeyword: "",
-        // endDeliverTime: "",
-        enginOrderNo: "",
         enginOrderType: this.enginOrderType,
-        examineStatus: this.examine,
-        refEnginRecordNo: "",
-        refProjectName: "",
-        refUseUnit: "",
+         ...this.screenForm,
+                 examineStatus: this.examine,
         // startDeliverTime: "",
       });
     },
@@ -491,12 +645,12 @@ export default {
     },
     //重置
     resetFn() {
-      this.searchForm.startInstallTime = "";
-      this.searchForm.endInstallTime = "";
-      this.$refs.searchForm.resetFields();
-      // this.searchForm.endSpecification = "";
-      // this.searchForm.endSpecialNo = "";
-      // this.searchForm.endRefFactoryNo = "";
+      this.screenForm.startInstallTime = "";
+      this.screenForm.endInstallTime = "";
+      this.$refs.screenForm.resetFields();
+      // this.screenForm.endSpecification = "";
+      // this.screenForm.endSpecialNo = "";
+      // this.screenForm.endRefFactoryNo = "";
     },
     //搜索
     searchFn() {
@@ -509,7 +663,7 @@ export default {
         enginOrderType: this.enginOrderType,
         examineStatus: this.examine,
         refUseUnit: "",
-        ...this.searchForm,
+        ...this.screenForm,
       });
     },
     //详情

src/views/deposit_home/components/deposit-apply-surrender.vue

@@ -52,7 +52,7 @@
           </el-col>
 
           <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label">跨区厂编号</div>
+            <div class="label">厂编号</div>
             <div class="value">
               {{ details.refFactoryNo }}
 <!--              <el-form-item prop="refFactoryNo">-->

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

@@ -87,7 +87,7 @@
               <div class="value">{{ details.refUseUnit }}</div>
             </el-col>
 <el-col :xs="24" :sm="24" :lg="12" class="item">
-              <div class="label">跨区厂编号</div>
+              <div class="label">厂编号</div>
               <div class="value">{{ details.refFactoryNo }}</div>
             </el-col>
             <el-col :xs="24" :sm="24" :lg="24" class="item">
@@ -148,7 +148,7 @@
 
             <el-table-column
               align="left"
-              label="跨区厂编号"
+              label="厂编号"
               prop="factoryNo"
               min-width="160"
               show-overflow-tooltip
@@ -419,7 +419,7 @@
             <div class="value">{{ details.checkBy }}</div>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="12" class="item">
-            <div class="label">验收日期</div>
+            <div class="label">受理日期</div>
             <div class="value">{{ details.checkDate }}</div>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="12" class="item">
@@ -762,7 +762,7 @@
           >
             <el-table-column
               align="left"
-              label="验收日期"
+              label="受理日期"
               prop="checkDate"
               min-width="160"
               show-overflow-tooltip

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

@@ -227,7 +227,7 @@
           <div class="value">2022123233435342</div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item">
-          <div class="label">验收日期</div>
+          <div class="label">受理日期</div>
           <div class="value">
             <el-date-picker type="date" placeholder=""> </el-date-picker>
           </div>
@@ -283,4 +283,4 @@ export default {
 .dateStyle {
   width: 100%;
 }
-</style>
+</style>

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

@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">跨区厂编号</div>
+          <div class="label">厂编号</div>
           <div class="value">{{ detailList.refFactoryNo }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
@@ -329,7 +329,7 @@
           <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="checkBy" 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="checkDate" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="是否退押" prop="checkBy" 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>
@@ -360,7 +360,7 @@
           <div class="value">{{ this.checkBy }}</div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item dateS">
-          <div class="label">验收日期</div>
+          <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>
@@ -393,7 +393,7 @@
           <div class="value">{{ detailList.checkBy }}</div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item dateS">
-          <div class="label">验收日期</div>
+          <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>

src/views/deposit_home/deposit_list.vue

@@ -74,7 +74,7 @@
               </el-form-item>
             </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始验收日期" prop="startConfirmTime">
+              <el-form-item label="开始受理日期" prop="startConfirmTime">
                 <el-date-picker
                   v-model="screenForm.startConfirmTime"
                   class="dateStyle"
@@ -84,7 +84,7 @@
               </el-form-item>
             </el-col>
              <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束验收日期" prop="endConfirmTime">
+              <el-form-item label="结束受理日期" prop="endConfirmTime">
                 <el-date-picker
                   v-model="screenForm.endConfirmTime"
                   class="dateStyle"
@@ -185,9 +185,9 @@
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-               <el-form-item label="跨区厂编号" prop="refFactoryNo">
+               <el-form-item label="厂编号" prop="refFactoryNo">
 
-                        <el-input  v-model="screenForm.refFactoryNo" placeholder="请输入跨区厂编号" ></el-input>
+                        <el-input  v-model="screenForm.refFactoryNo" placeholder="请输入厂编号" ></el-input>
 
                 </el-form-item>
 
@@ -276,7 +276,7 @@
             />
              <el-table-column
               align="left"
-              label="验收日期"
+              label="受理日期"
               prop="checkDate"
               min-width="160"
               show-overflow-tooltip

src/views/deposit_home/refund_list.vue

@@ -11,121 +11,227 @@
       <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" label-width="120px" size="mini" label-position="left">
-          <el-row :gutter="10">
+        <el-form
+          ref="screenForm"
+          :model="screenForm"
+          label-width="120px"
+          size="mini"
+          label-position="left"
+        >
+          <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="工程登录编号" prop="refEnginRecordNo">
-                <el-input v-model="searchForm.refEnginRecordNo" placeholder="请输入"></el-input>
+                <el-input
+                  v-model="screenForm.refEnginRecordNo"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编码" prop="customerKeyword">
-                <el-input v-model="searchForm.customerKeyword" placeholder="请输入"></el-input>
+              <el-form-item label="经销商编码/名称" prop="customerKeyword">
+                <el-input
+                  v-model="screenForm.customerKeyword"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商名称" prop="customerKeyword">
                 <el-input
-                  v-model="searchForm.customerKeyword"
+                  v-model="screenForm.customerKeyword"
                   placeholder="请输入"
                 ></el-input>
               </el-form-item>
             </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="行业类别" prop="refTradeCategory">
-                <el-input v-model="searchForm.refTradeCategory" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="使用单位" prop="refProjectName">
-                <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="审核人" prop="confirmName">
-                <el-input v-model="searchForm.confirmName" placeholder="请输入"></el-input>
+              <el-form-item label="使用单位" prop="refUseUnit">
+                <el-input
+                  v-model="screenForm.refUseUnit"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="specification">
-                <el-input v-model="searchForm.specification" placeholder="请输入"></el-input>
+              <el-form-item label="开始申请日期" prop="startSubmitTime">
+                <el-date-picker
+                  v-model="screenForm.startSubmitTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="特价编号" prop="specialNo">
-                <el-input v-model="searchForm.specialNo" placeholder="请输入"></el-input>
+             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="结束申请日期" prop="endSubmitTime">
+                <el-date-picker
+                  v-model="screenForm.endSubmitTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
+
+
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="跨区厂编号" prop="startRefFactoryNo">
-                <el-input v-model="searchForm.refFactoryNo" placeholder="请输入"></el-input>
+              <el-form-item label="是否退押 " prop="isRefundDeposit">
+                <el-select
+                  style="width: 100%"
+                  v-model="screenForm.isRefundDeposit"
+                  placeholder="请选择是否退押 "
+                >
+                  <el-option label="默认" :value="null"></el-option>
+
+                  <el-option
+                    v-for="item in refundDepositArr"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="区域" prop="refRegionWork">
-                <el-input v-model="searchForm.refRegionWork" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="12" :sm="12" :lg="12">
-              <el-form-item label="安装日期" prop="">
-                <div class="fanwei">
-                  <el-date-picker class="dateStyle" v-model="searchForm.startInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
-                  <span>-</span>
-                  <el-date-picker class="dateStyle" v-model="searchForm.endInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
-                </div>
+              <el-form-item label="状态 " prop="examineStatus">
+                <el-select
+                  style="width: 100%"
+                  v-model="screenForm.examineStatus"
+                  placeholder="请选择状态 "
+                >
+                  <el-option label="默认" :value="null"></el-option>
+
+                  <el-option
+                    v-for="item in examineStatusArr"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
-
             <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始安装日期" prop="startInstallTime">
-                <el-date-picker class="dateStyle" v-model="searchForm.startInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
+              <el-form-item label="产品名称" prop="">
+                <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束安装日期" prop="endInstallTime">
-                <el-date-picker class="dateStyle" v-model="searchForm.endInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
+              <el-form-item label="规格型号" prop="">
+                <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col> -->
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货申请开始日期" prop="startDeliverTime">
+             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="开始受理日期" prop="startConfirmTime">
                 <el-date-picker
+                  v-model="screenForm.startConfirmTime"
                   class="dateStyle"
-                  v-model="searchForm.startDeliverTime"
                   type="datetime"
-                  placeholder=""
-                  default-time="00:00:00"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
-                </el-date-picker>
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货申请结束日期" prop="endDeliverTime">
+              <el-form-item label="结束受理日期" prop="endConfirmTime">
                 <el-date-picker
-                  v-model="searchForm.endDeliverTime"
+                  v-model="screenForm.endConfirmTime"
                   class="dateStyle"
                   type="datetime"
-                  placeholder=""
-                  default-time="23:59:59"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col> -->
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品名称" prop="">
-                <el-input placeholder="请输入"></el-input>
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col> -->
+            <template v-if="!isCustomer">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="审核人" prop="confirmName">
+                  <el-input
+                    v-model="screenForm.confirmName"
+                    placeholder="请输入审核人"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="区域" prop="refRegionWork">
+                  <el-input
+                    v-model="screenForm.refRegionWork"
+                    placeholder="请输入区域"
+                  />
+                </el-form-item>
+              </el-col>
+                 <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="安装日期"   style="margin-bottom:0">
+                  <div class="fanwei">
+                     <el-form-item prop="startInstallTime">
+                          <el-date-picker
+                        v-model="screenForm.startInstallTime"
+                        class="dateStyle"
+                        type="datetime"
+                        placeholder="选择日期"
+                      />
+
+                     </el-form-item>
+                      <span>-</span>
+                    <el-form-item prop="endInstallTime">
+                                 <el-date-picker
+                  v-model="screenForm.endInstallTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
+
+                     </el-form-item>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="规格型号" prop="specification">
+                        <el-input  v-model="screenForm.specification" ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="特价编号" prop="specialNo">
+
+                        <el-input  v-model="screenForm.specialNo" ></el-input>
+
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+               <el-form-item label="跨区厂编号" prop="refFactoryNo">
+
+                        <el-input  v-model="screenForm.refFactoryNo" ></el-input>
 
-            <el-col :xs="24" :sm="12" :lg="18">
+                </el-form-item>
+
+              </el-col>
+              <!-- <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="产品编码" >
+                  <div class="fanwei">
+                     <el-form-item prop="startMaterialOldNumber">
+                        <el-input type="startMaterialOldNumber" ></el-input>
+                     </el-form-item>
+
+                  <span>-</span>
+                    <el-form-item prop="endMaterialOldNumber">
+                    <el-input type="endMaterialOldNumber" ></el-input>
+                     </el-form-item>
+                  </div>
+
+                </el-form-item>
+
+
+              </el-col> -->
+
+            </template>
+            <el-col :xs="24" :sm="24" :lg="24">
+             <div class="fl">
+          <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
+            <el-radio-button label="HOME">家用工程</el-radio-button>
+            <el-radio-button label="TRADE">商用工程</el-radio-button>
+          </el-radio-group> -->
+          <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
+        </div>
               <el-form-item label="" class="fr">
-                <el-button size="mini" @click="resetFn">清空</el-button>
+                     <el-button size="mini" @click="resetFn">清空</el-button>
                 <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
               </el-form-item>
             </el-col>
@@ -181,7 +287,7 @@
                 <span>{{scope.row.customerName}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="跨区厂编号" prop="refFactoryNo" min-width="260" show-overflow-tooltip>
+            <el-table-column align="left" label="厂编号" prop="refFactoryNo" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refFactoryNo" />
                 <span>{{scope.row.refFactoryNo}}</span>
@@ -303,22 +409,64 @@ export default {
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
       dataList: [], // 列表数据
-      searchForm: {
-        refEnginRecordNo: "",
-        customerKeyword: "",
-        refProjectName: "",
-        refTradeCategory: '',
-        confirmName: "",
-        specification: "",
-        endSpecification: "",
-        specialNo: "",
-        endSpecialNo: "",
-        refFactoryNo: "",
-        endRefFactoryNo: "",
+        screenForm: {
+        confirmName: "", // 审核人
+        createName: "", // 创建人
+        customerKeyword: "", // 客户编码/客户名称
+        endDeliverTime: "", // 发货申请日期-结束
+        enginOrderNo: "", // 工程订单编号
+        enginOrderType: "HOME", // 工程订单类型
+        examineStatus: "", // 状态
+        refEnginRecordNo: "", // 登录单号
+        refProjectName: "", // 项目名称
+        refUseUnit: "", // 使用单位
+        startDeliverTime: "", // 发货申请日期-开始
+        startSubmitTime: "",
+        startConfirmTime: "",
+        isRefundDeposit: null,
         startInstallTime: "",
+        endConfirmTime: "",
         endInstallTime: "",
+        specification:'',
+        refFactoryNo:'',
+        factoryNo: "",
+        specialNo: "",
         refRegionWork: "",
-      }, //搜索表单
+        endSubmitTime:'',
+      }, // 搜索表单
+       refundDepositArr: [
+        {
+          label: "是",
+          value: true,
+        },
+        {
+          label: "否",
+          value: false,
+        },
+      ],
+
+      examineStatusArr: [
+        {
+          label: "保存",
+          value: "SAVE",
+        },
+        {
+          label: "待审核",
+          value: "WAIT",
+        },
+        {
+          label: "通过",
+          value: "OK",
+        },
+        {
+          label: "不通过",
+          value: "FAIL",
+        },
+        {
+          label: "关闭",
+          value: "CLOSE",
+        },
+      ],
       listLoading: false, // 列表加载loading
       examine: "",
       showSurrender: true,
@@ -330,19 +478,18 @@ export default {
     this.getDataList({
       pageSize: this.pageSize,
       pageNum: this.currentPage,
-      confirmName: "",
-      createName: "",
-      customerKeyword: "",
-      // endDeliverTime: "",
-      enginOrderNo: "",
       enginOrderType: this.enginOrderType,
-      examineStatus: "",
-      refEnginRecordNo: "",
-      refProjectName: "",
-      refUseUnit: "",
+       ...this.screenForm,
       // startDeliverTime: "",
     });
   },
+   computed: {
+    isCustomer() {
+      return (
+        this.$store.getters.customerId && this.$store.getters.customerNumber
+      );
+    },
+  },
   methods: {
     //同步资料日期
     async syncDateFn() {
@@ -375,6 +522,7 @@ export default {
           refEnginRecordNo: "",
           refProjectName: "",
           refUseUnit: "",
+           ...this.screenForm,
           // startDeliverTime: "",
         });
       } else {
@@ -396,6 +544,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
+         ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -418,6 +567,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
+         ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -438,6 +588,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
+         ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -457,6 +608,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
+         ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -466,16 +618,9 @@ export default {
       this.getDataList({
         pageSize: this.pageSize,
         pageNum: this.currentPage,
-        confirmName: "",
-        createName: "",
-        customerKeyword: "",
-        // endDeliverTime: "",
-        enginOrderNo: "",
         enginOrderType: this.enginOrderType,
-        examineStatus: this.examine,
-        refEnginRecordNo: "",
-        refProjectName: "",
-        refUseUnit: "",
+         ...this.screenForm,
+                 examineStatus: this.examine,
         // startDeliverTime: "",
       });
     },
@@ -500,12 +645,12 @@ export default {
     },
     //重置
     resetFn() {
-      this.searchForm.startInstallTime = "";
-      this.searchForm.endInstallTime = "";
-      this.$refs.searchForm.resetFields();
-      // this.searchForm.endSpecification = "";
-      // this.searchForm.endSpecialNo = "";
-      // this.searchForm.endRefFactoryNo = "";
+      this.screenForm.startInstallTime = "";
+      this.screenForm.endInstallTime = "";
+      this.$refs.screenForm.resetFields();
+      // this.screenForm.endSpecification = "";
+      // this.screenForm.endSpecialNo = "";
+      // this.screenForm.endRefFactoryNo = "";
     },
     //搜索
     searchFn() {
@@ -518,7 +663,7 @@ export default {
         enginOrderType: this.enginOrderType,
         examineStatus: this.examine,
         refUseUnit: "",
-        ...this.searchForm,
+        ...this.screenForm,
       });
     },
     //详情

src/views/sales_policy/policy_list.vue

@@ -186,7 +186,14 @@
     </div>
     <div class="mymain-container">
       <div class="table">
-      <el-table :data="dataList" border style="width: 100%" class="table">
+      <el-table
+
+      :data="dataList"
+        :row-class-name="tableRowClassName"
+      border
+
+      style="width: 100%"
+     >
         <el-table-column
           fixed="left"
           label="操作"
@@ -472,6 +479,13 @@ export default {
     comCode: (state) => state.sales.code
   }),
   methods: {
+    tableRowClassName({row, rowIndex}) {
+      // || row.examineStatus=='FAIL'
+     if (row.status == 0 ) {
+          return 'warning-row';
+        }
+        return '';
+    },
     hanlenewInfo() {
       console.log()
       getId().then((res) => {
@@ -603,6 +617,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+ ::v-deep .el-table .warning-row {
+    background:  oldlace;
+  }
+  // ::v-deep  .el-table .success-row {
+  //   background: #f0f9eb;
+  // }
 .btn {
   width: 80px;
 }

src/views/supply/apply/components/engin_examine.vue

@@ -126,8 +126,16 @@
         <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="right" label="申请数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+  <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.price | numToFixed }}
+          </template>
+        </el-table-column>
+        <el-table-column align="right" label="金额" prop="totalAmount" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.totalAmount | numToFixed }}
+          </template>
+        </el-table-column>        <el-table-column align="right" label="申请数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.approvalNumber" disabled size="small" type="number"></el-input>

src/views/supply/engin/components/commerce_form.vue

@@ -491,7 +491,7 @@ export default {
         if(this.isFirst) {
           this.isFirst = false;
         }else {
-          this.mainForm.salesMan = this.goodsList[0].serviceId;
+          // this.mainForm.salesMan = this.goodsList[0].serviceId;
         }
       }
       return list
@@ -505,7 +505,7 @@ export default {
           if(this.isFirst) {
             this.isFirst = false;
           }else {
-            this.mainForm.salesMan = this.goodsList[0].serviceId;
+            // this.mainForm.salesMan = this.goodsList[0].serviceId;
           }
         }else {
           this.mainForm.salesMan = '';

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

@@ -551,10 +551,11 @@
           <el-table-column
             align="right"
             label="订单数量"
-            prop="refundableQty"
+            prop="qty"
             min-width="100"
             show-overflow-tooltip
           />
+          <!-- refundableQty -->
           <el-table-column
             align="right"
             label="发货数量"

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

@@ -17,7 +17,7 @@
       label-position="right"
     >
       <el-row :gutter="20">
-        <el-col :xs="24" :sm="12" :lg="8">
+        <el-col :xs="24" :sm="12" :lg="12">
           <el-form-item label="销售政策编号" prop="policyCode">
             <div style="display: flex">
               <el-input
@@ -43,7 +43,7 @@
           </el-form-item>
 
         </el-col> -->
-        <el-col :xs="24" :sm="12" :lg="8" style="height: 51px">
+        <el-col :xs="24" :sm="12" :lg="12" style="height: 51px">
           <el-form-item label="单据日期" prop="date">
             <el-date-picker
               v-model="mainForm.date"
@@ -55,15 +55,15 @@
           </el-form-item>
         </el-col>
 
-        <el-col :xs="24" :sm="8" :lg="8">
-          <el-form-item label="备注" prop="remark">
+        <el-col :xs="24" :sm="12" :lg="12">
+          <el-form-item label="表头备注" prop="remark">
             <el-input
               v-model="mainForm.remark"
-              placeholder="请输入备注"
+              placeholder="请输入表头备注"
             />
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
+        <el-col :xs="24" :sm="12" :lg="12">
           <el-form-item label="业务员" prop="k3ServiceName">
             <el-select
               v-model="mainForm.k3ServiceName"
@@ -358,7 +358,7 @@
         </el-table-column> -->
         <el-table-column
           align="left"
-          label="备注"
+          label="表头备注"
           prop="remark"
           min-width="160"
         >