【修改】bug

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

@@ -800,7 +800,7 @@ export default {
             fileUrl: this.fileList && this.fileList.length > 0 ? this.fileList[0].url : '',
             fileName: this.fileList && this.fileList.length > 0 ? this.fileList[0].name : '',
             correspondId: this.mainForm.warehouse,
-            correspondName: warehouseItem.name?warehouseItem.name:'',
+            correspondName: warehouseItem?warehouseItem.name:'',
             salesOrderId: this.goodsList[0].id,
             orders: goodsList,
             examineStatus: status,

src/views/supply/implement/nsales_list.vue

@@ -53,16 +53,31 @@
                 <el-input v-model="screenForm.warehouse" placeholder="请输入仓库名称"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货日期" prop="date">
+           <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="单据日期" prop="date">
                 <el-date-picker
                   v-model="screenForm.date"
                   type="datetimerange"
                   range-separator="至"
-                  style="width: 100%;"
+                  style="width: 100%"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="审核日期" prop="approval">
+                <el-date-picker
+                  v-model="screenForm.approval"
+                  type="datetimerange"
+                  range-separator="至"
+                  style="width: 100%"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   start-placeholder="开始日期"
-                  end-placeholder="结束日期">
+                  end-placeholder="结束日期"
+                >
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -272,6 +287,7 @@ export default {
         warehouse: '',
         date: '',
         status: '',
+        approval:'',
         mainOrderId: '',
       },
       statusList: [
@@ -323,6 +339,8 @@ export default {
         correspondName: this.screenForm.warehouse,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
+         approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : "",
+        approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : "",
         mainOrderId: this.screenForm.mainOrderId,
       }
     },
@@ -354,6 +372,8 @@ export default {
         correspondName: this.screenForm.warehouse,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
+         approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : "",
+        approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : "",
         mainOrderId: this.screenForm.mainOrderId,
       };
       getList(params).then((res) => {

src/views/supply/sales/sales_list.vue

@@ -89,7 +89,7 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货日期" prop="date">
+              <el-form-item label="单据日期" prop="date">
                 <el-date-picker
                   v-model="screenForm.date"
                   type="datetimerange"
@@ -102,6 +102,20 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="审核日期" prop="approval">
+                <el-date-picker
+                  v-model="screenForm.approval"
+                  type="datetimerange"
+                  range-separator="至"
+                  style="width: 100%"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
 
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
@@ -135,7 +149,7 @@
               v-if="$checkBtnRole('examine', $route.meta.roles)"
               >批量审批</el-button
             >
-
+              <template       v-if="$checkBtnRole('receipt', $route.meta.roles)">
             <el-date-picker
               v-model="value1"
               size="mini"
@@ -150,11 +164,13 @@
             </el-date-picker>
             <el-button
               size="mini"
+
               type="warning"
               icon="el-icon-finished"
               @click="updateReceipt"
               >更新发票</el-button
             >
+              </template>
           </div>
           <div class="fr">
             <ExportButton :exUrl="'sale/order/export'" :exParams="exParams" />
@@ -459,6 +475,8 @@ export default {
         date: "",
         status: "",
         mainOrderId: "",
+        approval:'',
+
       },
       statusList: [
         { label: "已保存", value: "SAVE" },
@@ -509,6 +527,8 @@ export default {
         correspondName: this.screenForm.warehouse,
         startTime: this.screenForm.date ? this.screenForm.date[0] : "",
         endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : "",
+        approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : "",
         mainOrderId: this.screenForm.mainOrderId,
       };
     },
@@ -540,6 +560,8 @@ export default {
         correspondName: this.screenForm.warehouse,
         startTime: this.screenForm.date ? this.screenForm.date[0] : "",
         endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+         approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : "",
+        approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : "",
         mainOrderId: this.screenForm.mainOrderId,
       };
       getList(params).then((res) => {