diff --git a/sgzb-ui/src/views/base/assetAttributeManagement/index.vue b/sgzb-ui/src/views/base/assetAttributeManagement/index.vue
index d53de42e..9c20ed9c 100644
--- a/sgzb-ui/src/views/base/assetAttributeManagement/index.vue
+++ b/sgzb-ui/src/views/base/assetAttributeManagement/index.vue
@@ -93,7 +93,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px"> 
         <el-form-item label="资产类型名称" prop="propName">
           <el-input v-model="form.propName" placeholder="请输入资产类型名称" maxlength="60"/>
diff --git a/sgzb-ui/src/views/base/comeAndGo/index.vue b/sgzb-ui/src/views/base/comeAndGo/index.vue
index f3f712c2..ef09bbcb 100644
--- a/sgzb-ui/src/views/base/comeAndGo/index.vue
+++ b/sgzb-ui/src/views/base/comeAndGo/index.vue
@@ -151,7 +151,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="单位名称" prop="unitName">
           <el-input
diff --git a/sgzb-ui/src/views/base/project/index.vue b/sgzb-ui/src/views/base/project/index.vue
index c4d51aff..24ea74b3 100644
--- a/sgzb-ui/src/views/base/project/index.vue
+++ b/sgzb-ui/src/views/base/project/index.vue
@@ -86,7 +86,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="工程项目名称" prop="proName">
           <el-input v-model="form.proName" placeholder="请输入单位类型名称" maxlength="50"/>
diff --git a/sgzb-ui/src/views/base/section/index.vue b/sgzb-ui/src/views/base/section/index.vue
index 0882176b..ad993b19 100644
--- a/sgzb-ui/src/views/base/section/index.vue
+++ b/sgzb-ui/src/views/base/section/index.vue
@@ -145,7 +145,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="标段工程名称" prop="lotName">
           <el-input v-model="form.lotName" placeholder="请输入标段工程名称" maxlength="50"/>
diff --git a/sgzb-ui/src/views/base/unit/index.vue b/sgzb-ui/src/views/base/unit/index.vue
index 068a181f..466cecb0 100644
--- a/sgzb-ui/src/views/base/unit/index.vue
+++ b/sgzb-ui/src/views/base/unit/index.vue
@@ -83,7 +83,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="单位类型名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入单位类型名称" maxlength="50"/>
diff --git a/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue b/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
index 379b7f16..d73893af 100644
--- a/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
+++ b/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
@@ -153,7 +153,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1200px"   append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false">
       <el-form :model="dialogParams" ref="dialogForm" :rules="rules" size="small" :inline="true" label-width="100px">
         <el-row>
           <el-form-item label="退料单位" prop="backUnitId">
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
index 23d996e6..e7bb541d 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
@@ -132,91 +132,138 @@
     />
 
     <!-- 新增编辑弹窗 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="合同编号" prop="contractCode">
-          <el-input 
-            maxlength="50" v-model="form.contractCode" placeholder="合同编号" />
-        </el-form-item>
-        <el-form-item label="往来单位:" prop="unitId">
-          <el-select v-model="form.unitId" filterable  placeholder="请选择往来单位" style="width: 100%;" >
-            <el-option
-              v-for="item in unitList"
-              :key="item.unitId"
-              :label="item.unitName"
-              :value="item.unitId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="工程名称" prop="projectId">
-          <el-select v-model="form.projectId" filterable placeholder="请选择工程名称" style="width: 100%;" >
-            <el-option
-              v-for="item in projectList"
-              :key="item.projectId"
-              :label="item.projectName"
-              :value="item.projectId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="协议类型" prop="protocol">
-          <el-select v-model="form.protocol" filterable placeholder="请选择协议类型" style="width: 100%;" >
-            <el-option
-              v-for="item in protocolList"
-              :key="item.protocolId"
-              :label="item.protocolName"
-              :value="item.protocolId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="合同编号" prop="contractCode">
+              <el-input maxlength="50" v-model="form.contractCode" placeholder="合同编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="往来单位:" prop="unitId">
+              <el-select v-model="form.unitId" filterable  placeholder="请选择往来单位"   >
+                <el-option
+                  v-for="item in unitList"
+                  :key="item.unitId"
+                  :label="item.unitName"
+                  :value="item.unitId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="工程名称" prop="projectId">
+              <el-select v-model="form.projectId" filterable placeholder="请选择工程名称"  >
+                <el-option
+                  v-for="item in projectList"
+                  :key="item.projectId"
+                  :label="item.projectName"
+                  :value="item.projectId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="协议类型" prop="protocol">
+              <el-select v-model="form.protocol" filterable placeholder="请选择协议类型"   >
+                <el-option
+                  v-for="item in protocolList"
+                  :key="item.protocolId"
+                  :label="item.protocolName"
+                  :value="item.protocolId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="协议类型" prop="protocol">
+              <el-select v-model="form.protocol" filterable placeholder="请选择协议类型"   >
+                <el-option
+                  v-for="item in protocolList"
+                  :key="item.protocolId"
+                  :label="item.protocolName"
+                  :value="item.protocolId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开始日期" prop="planStartTime">
+              <el-date-picker
+                  style="width:100%;"
+                  v-model="form.planStartTime"
+                  value-format="yyyy-MM-dd"
+                  type="date"
+                  placeholder="开始日期"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="租赁期限(天)" prop="leaseDay">
+              <el-input-number v-model="form.leaseDay"   placeholder="请输入租赁期限(天)" controls-position="right" :min="0" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="签订日期" prop="signTime">
+              <el-date-picker
+                  v-model="form.signTime"
+                  style="width:100%;"
+                  value-format="yyyy-MM-dd"
+                  type="date"
+                  placeholder="开始日期"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
         
-        <el-form-item label="开始日期" prop="planStartTime">
-          <el-date-picker
-              style="width:100%;"
-              v-model="form.planStartTime"
-              value-format="yyyy-MM-dd"
-              type="date"
-              placeholder="开始日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="租赁期限(天)" prop="leaseDay">
-          <el-input-number v-model="form.leaseDay" style="width:100%;" placeholder="请输入租赁期限(天)" controls-position="right" :min="0" />
-        </el-form-item>
-        <el-form-item label="签订日期" prop="signTime">
-          <el-date-picker
-              v-model="form.signTime"
-              style="width:100%;"
-              value-format="yyyy-MM-dd"
-              type="date"
-              placeholder="开始日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="授权人" prop="authPerson">
-          <el-input 
-          maxlength="50" v-model="form.authPerson" placeholder="请输入授权人" />
-        </el-form-item>
-      
-        <el-form-item label="联系方式" prop="phone">
-          <el-input v-model="form.phone" placeholder="请输入联系方式" />
-        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="授权人" prop="authPerson">
+              <el-input 
+              maxlength="50" v-model="form.authPerson" placeholder="请输入授权人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系方式" prop="phone">
+              <el-input v-model="form.phone" placeholder="请输入联系方式" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+       
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="合同照片" prop="fileName">
+              <el-upload 
+                    :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
+                    action="#" :limit='1'
+                    :file-list="fileList"
+                    :show-file-list="true"
+                    list-type="picture-card"
+                    accept=".png,.jpg,.jpeg"
+                    :on-success="handleAvatarSuccess"
+                    :on-preview="handlePictureCardPreview"
+                    :on-remove="handleRemove">
+                    <i  class="el-icon-plus avatar-uploader-icon"></i>
+                  </el-upload>
 
-        <el-form-item label="合同照片" prop="fileName">
-          <el-upload 
-                :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
-                action="#" :limit='1'
-                :file-list="fileList"
-                :show-file-list="true"
-                list-type="picture-card"
-                accept=".png,.jpg,.jpeg"
-                :on-success="handleAvatarSuccess"
-                :on-preview="handlePictureCardPreview"
-                :on-remove="handleRemove">
-                <i  class="el-icon-plus avatar-uploader-icon"></i>
-              </el-upload>
-
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
-        </el-form-item>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="200"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer" style="text-align: center">
         <el-button type="primary" @click="submitForm">确 定</el-button>
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
index 83bcb8c1..21aa541e 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
@@ -122,7 +122,7 @@
     </div>
 
     <!-- 同意 -->
-    <el-dialog title="审核意见" :visible.sync="examineVisible" width="600px">
+    <el-dialog title="审核意见" :visible.sync="examineVisible" width="600px" :close-on-click-modal="false">
       <el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
       <div slot="footer" class="dialog-footer">
         <el-button @click="examineVisible=false">取 消</el-button>
@@ -135,7 +135,7 @@
       </div>
     </el-dialog>
     <!-- 驳回 -->
-    <el-dialog title="审核意见" :visible.sync="refuseVisible" width="600px">
+    <el-dialog title="审核意见" :visible.sync="refuseVisible" width="600px" :close-on-click-modal="false">
       <el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
       <div slot="footer" class="dialog-footer">
         <el-button @click="refuseVisible=false">取 消</el-button>
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
index 22fc088f..655ac5d7 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
@@ -122,7 +122,7 @@
     </div>
 
     <!-- 同意 -->
-    <el-dialog title="审核意见" :visible.sync="examineVisible" width="600px">
+    <el-dialog title="审核意见" :visible.sync="examineVisible" width="600px" :close-on-click-modal="false">
       <el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
       <div slot="footer" class="dialog-footer">
         <el-button @click="examineVisible=false">取 消</el-button>
@@ -132,7 +132,7 @@
       </div>
     </el-dialog>
     <!-- 驳回 -->
-    <el-dialog title="审核意见" :visible.sync="refuseVisible" width="600px">
+    <el-dialog title="审核意见" :visible.sync="refuseVisible" width="600px" :close-on-click-modal="false">
       <el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
       <div slot="footer" class="dialog-footer">
         <el-button @click="refuseVisible=false">取 消</el-button>
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
index cb871aed..7d59ee8c 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
@@ -186,7 +186,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
       <el-form :model="dialogQueryParams" ref="queryForm1" size="small" :inline="true" v-show="showSearch" label-width="100px">
         <el-row>
           <el-form-item label="退料单位" prop="unitName">
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue b/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
index 9061a12c..5fe3d088 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
@@ -10,7 +10,7 @@
     >
       <el-form-item label="关键字" >
         <el-input
-           
+          v-model="queryParams.keyWord"
           placeholder="请输入关键字"
           clearable
           style="width: 240px"
@@ -19,6 +19,7 @@
       </el-form-item>
       <el-form-item label="单位名称" >
         <el-input
+          v-model="queryParams.unitName"
           placeholder="请输入单位名称"
           clearable
           style="width: 240px"
@@ -27,6 +28,7 @@
       </el-form-item>
       <el-form-item label="工程名称" >
         <el-input
+          v-model="queryParams.proName"
           placeholder="请输入工程名称"
           clearable
           style="width: 240px"
@@ -35,6 +37,7 @@
       </el-form-item>
       <el-form-item label="工机具类型" >
         <el-input
+          v-model="queryParams.maType"
           placeholder="请输入工机具类型"
           clearable
           style="width: 240px"
@@ -43,6 +46,7 @@
       </el-form-item>
       <el-form-item label="协议号" >
         <el-input
+          v-model="queryParams.agreementId"
           placeholder="请选择协议号"
           clearable
           style="width: 240px"
@@ -51,6 +55,7 @@
       </el-form-item>
       <el-form-item label="完成情况" >
         <el-input
+          v-model="queryParams.status"
           placeholder="请选择完成情况"
           clearable
           style="width: 240px"
@@ -60,6 +65,7 @@
 
       <el-form-item label="退料申请时间" >
         <el-input
+          v-model="queryParams.sTime"
           placeholder="请输入退料申请时间"
           clearable
           style="width: 240px"
@@ -540,10 +546,10 @@ export default {
     },
     // 完成退料
     handleFinish() {
-      this.title = "确认操作";
-      this.openTextOne = "确认完成退料么?";
-      this.openTextTwo = "确认完成退料么?";
-      this.openOne = true
+      // this.title = "确认操作";
+      // this.openTextOne = "确认完成退料么?";
+      // this.openTextTwo = "确认完成退料么?";
+      // this.openOne = true
     },
     submitOpenOneForm() {
       this.openTextThree = "完成退料成功！";
diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
index 6c51f0a2..3d55a0ec 100644
--- a/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
+++ b/sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
@@ -119,7 +119,7 @@
     />
 
       <!-- 出库弹窗 -->
-    <el-dialog :title="title" :visible.sync="openOut" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="openOut" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="类型名称:" prop="typeName">
           <el-input v-model="form.typeName" placeholder="请输入类型名称" disabled/>
@@ -151,7 +151,7 @@
     </el-dialog>
 
     <!-- 进库弹窗 -->
-    <el-dialog :title="title" :visible.sync="openIn" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="openIn" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="nform" :model="nform" :rules="nrules" label-width="120px">
         <el-form-item label="类型名称:" prop="typeName">
           <el-input v-model="nform.typeName" placeholder="请输入类型名称" disabled/>
diff --git a/sgzb-ui/src/views/store/label/labelBinding.vue b/sgzb-ui/src/views/store/label/labelBinding.vue
index b5e9aae4..0aa983c7 100644
--- a/sgzb-ui/src/views/store/label/labelBinding.vue
+++ b/sgzb-ui/src/views/store/label/labelBinding.vue
@@ -267,7 +267,7 @@
     </div>
 
     <!-- 标签绑定对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标签类型" prop="labelType">
           <el-select
@@ -331,7 +331,7 @@
       :title="title"
       :visible.sync="createOpen"
       width="500px"
-      append-to-body
+      append-to-body :close-on-click-modal="false"
     >
       <el-form ref="cform" :model="cform" :rules="crules" label-width="80px">
         <el-form-item label="标签类型" prop="labelType">
@@ -372,7 +372,7 @@
       :title="title"
       :visible.sync="uploadOpen"
       width="450px"
-      append-to-body
+      append-to-body :close-on-click-modal="false"
     >
       <div style="text-align: center" ref="codeBox">
         <div class="uploadImg">
diff --git a/sgzb-ui/src/views/store/label/labelBindingHistory.vue b/sgzb-ui/src/views/store/label/labelBindingHistory.vue
index 34577ef8..954dd153 100644
--- a/sgzb-ui/src/views/store/label/labelBindingHistory.vue
+++ b/sgzb-ui/src/views/store/label/labelBindingHistory.vue
@@ -221,7 +221,7 @@
       :title="title"
       :visible.sync="uploadOpen"
       width="500px"
-      append-to-body
+      append-to-body :close-on-click-modal="false"
     >
       <div style="text-align: center">
         <div class="uploadImg">
@@ -232,7 +232,7 @@
     </el-dialog>
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典名称" prop="labelType">
           <el-input v-model="form.labelType" placeholder="请输入字典名称" />
diff --git a/sgzb-ui/src/views/store/label/labelType.vue b/sgzb-ui/src/views/store/label/labelType.vue
index 5ea8c44b..17f851e4 100644
--- a/sgzb-ui/src/views/store/label/labelType.vue
+++ b/sgzb-ui/src/views/store/label/labelType.vue
@@ -109,7 +109,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="标签种类名称" prop="dictName">
           <el-input v-model="form.dictName" placeholder="请输入标签种类名称" />
diff --git a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
index 9ffffaad..a52493a0 100644
--- a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
+++ b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
@@ -9,9 +9,7 @@
                 value-format="yyyy-MM-dd"
                 type="date"
                 :disabled="isCheck||isView"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                placeholder="请选择采购日期"
             ></el-date-picker>
           </el-form-item>
           <el-form-item label="到货日期" prop="arrivalTime"> 
@@ -21,9 +19,8 @@
                 value-format="yyyy-MM-dd"
                 type="date"
                 :disabled="isCheck||isView"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                :picker-options="pickerOptions"
+                placeholder="请选择到货日期"
             ></el-date-picker>
           </el-form-item>
           <el-form-item label="采购员" prop="purchaser">
@@ -176,7 +173,7 @@
     
 
     <!-- 验收对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="配件名称:" prop="machineTypeName">
           <el-input v-model="form.machineTypeName" disabled maxlength="50" />
@@ -332,6 +329,29 @@ export default {
       },
     };
   },
+  computed: {
+    pickerOptions() {
+      const that = this;
+      return {
+        disabledDate(time) {
+          if (that.maForm.purchaseTime) {
+            return (
+              time.getTime() < Date.now() ||
+              time.getTime() < new Date(that.maForm.purchaseTime).getTime() - 8.64e7
+            );
+          }
+          return time.getTime() < Date.now(); //实现1效果
+        },
+      };
+    },
+  },
+  watch: {
+    'maForm.purchaseTime'() {
+      if (this.maForm.purchaseTime != '') {
+        this.maForm.arrivalTime = ''
+      }
+    }
+  },
   created() { 
     const taskId = this.$route.query && this.$route.query.taskId;
     this.taskId = taskId;
diff --git a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
index e70810e6..2a881fd1 100644
--- a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
@@ -113,32 +113,7 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="基层单位" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入基层单位" />
-        </el-form-item>
-        <el-form-item label="规格型号" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入基层单位" />
-        </el-form-item>
-        <el-form-item label="计划数" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入基层单位" />
-        </el-form-item>
-        <el-form-item label="计划单价" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入基层单位" />
-        </el-form-item>
-        <el-form-item label="备注" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入基层单位" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
+ 
     <!-- 验收单弹窗 -->
     <el-dialog :title="title" :visible.sync="openPrint" width="1100px" append-to-body>
       <div style="height: 400px;overflow-y: scroll;">
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
index 34b20c75..c2bc3b54 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
@@ -110,7 +110,7 @@
      
 
     <!-- 验收弹窗 -->
-    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="机具类型名称:" prop="machineTypeName">
           <el-input v-model="form.machineTypeName" placeholder="" disabled/>
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
index 587908e9..7a0ed5a7 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
@@ -58,9 +58,7 @@
               style="width: 240px"
               value-format="yyyy-MM-dd"
               type="date"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              placeholder="请选择采购日期"
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="到货日期" prop="arrivalTime"> 
@@ -68,10 +66,9 @@
               v-model="maForm.arrivalTime"
               style="width: 240px"
               value-format="yyyy-MM-dd"
+              :picker-options="pickerOptions"
               type="date"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              placeholder="请选择到货日期"
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="采购员" prop="purchaser">
@@ -310,9 +307,32 @@ export default {
         // purchaser: [
         //   { required: true, message: "采购员不能为空", trigger: "blur" }
         // ]
-      }
+      },
     };
   },
+  computed: {
+    pickerOptions() {
+      const that = this;
+      return {
+        disabledDate(time) {
+          if (that.maForm.purchaseTime) {
+            return (
+              time.getTime() < Date.now() ||
+              time.getTime() < new Date(that.maForm.purchaseTime).getTime() - 8.64e7
+            );
+          }
+          return time.getTime() < Date.now(); //实现1效果
+        },
+      };
+    },
+  },
+  watch: {
+    'maForm.purchaseTime'() {
+      if (this.maForm.purchaseTime != '') {
+        this.maForm.arrivalTime = ''
+      }
+    }
+  },
   created() {
     const taskId = this.$route.query && this.$route.query.taskId;
     this.taskId = taskId;
@@ -384,6 +404,7 @@ export default {
                 break;
             }
         }
+        this.$set(row, 'createTime', null);
         this.$set(row, 'productionTime', '');
         this.$set(row, 'supplierId', '');
         this.$set(row, 'purchasePrice', 0);
@@ -543,11 +564,14 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       console.log(row.id)
-      this.equipmentList.forEach((item,index)=>{
-        if(item.id == row.id){
-          this.equipmentList.splice(index,1)
-        }
-      })
+      this.$modal.confirm('是否确认删除该数据项？').then(() => {
+        this.equipmentList.forEach((item,index)=>{
+          if(item.id == row.id){
+            this.equipmentList.splice(index,1)
+          }
+        })
+      }).catch(() => {});
+      
       
       // const roleIds = row.roleId || this.ids;
       // this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
@@ -562,7 +586,9 @@ export default {
       // this.download('system/role/export', {
       //   ...this.queryParams
       // }, `role_${new Date().getTime()}.xlsx`)
-    }
+    },
+    
+
   }
 };
 </script>
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
index 60b021dd..930a72e5 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
@@ -99,7 +99,7 @@
     /> -->
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
       <el-row :gutter="24" class="mb8">
         <el-form ref="form" :model="form" :rules="rules" label-width="78px">
           <el-input v-model="form.typeId" disabled  v-show="false"/>
diff --git a/sgzb-ui/src/views/store/shelves/shelvesConfig.vue b/sgzb-ui/src/views/store/shelves/shelvesConfig.vue
index 4a382cff..991dfa76 100644
--- a/sgzb-ui/src/views/store/shelves/shelvesConfig.vue
+++ b/sgzb-ui/src/views/store/shelves/shelvesConfig.vue
@@ -153,7 +153,7 @@
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
diff --git a/sgzb-ui/src/views/store/shelves/shelvesList.vue b/sgzb-ui/src/views/store/shelves/shelvesList.vue
index 043fcfc1..133ac5e9 100644
--- a/sgzb-ui/src/views/store/shelves/shelvesList.vue
+++ b/sgzb-ui/src/views/store/shelves/shelvesList.vue
@@ -75,7 +75,7 @@
     </el-table>
 
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24">
diff --git a/sgzb-ui/src/views/store/tools/devices.vue b/sgzb-ui/src/views/store/tools/devices.vue
index 8975d957..d3d700fc 100644
--- a/sgzb-ui/src/views/store/tools/devices.vue
+++ b/sgzb-ui/src/views/store/tools/devices.vue
@@ -157,7 +157,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="8">
diff --git a/sgzb-ui/src/views/store/tools/toolsSupplier.vue b/sgzb-ui/src/views/store/tools/toolsSupplier.vue
index 18b0f4bf..ce5f1dff 100644
--- a/sgzb-ui/src/views/store/tools/toolsSupplier.vue
+++ b/sgzb-ui/src/views/store/tools/toolsSupplier.vue
@@ -121,7 +121,7 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="供应商名称" prop="supplier">
           <el-input v-model="form.supplier" placeholder="请输入供应商名称" maxlength="50"/>
diff --git a/sgzb-ui/src/views/store/tools/toolsType.vue b/sgzb-ui/src/views/store/tools/toolsType.vue
index 08d8bb4e..01a4278f 100644
--- a/sgzb-ui/src/views/store/tools/toolsType.vue
+++ b/sgzb-ui/src/views/store/tools/toolsType.vue
@@ -158,7 +158,7 @@
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="850px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="850px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
@@ -305,7 +305,7 @@
 
 
     <!--    配置弹窗  -->
-    <el-dialog :title="title" :visible.sync="configOpen" width="650px" append-to-body>
+    <el-dialog :title="title" :visible.sync="configOpen" width="650px" append-to-body :close-on-click-modal="false">
       <el-form ref="cform" :model="cform" :rules="crules" label-width="110px">
         <el-row>
           <el-col :span="24">
diff --git a/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue b/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
index 069ac90d..1075fef1 100644
--- a/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
+++ b/sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
@@ -161,7 +161,7 @@
 
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
       <el-form :model="query" ref="query" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="关键字" prop="keyWord">
           <el-input
diff --git a/sgzb-ui/src/views/system/notice/index.vue b/sgzb-ui/src/views/system/notice/index.vue
index db0f24a3..d0b9e0ca 100644
--- a/sgzb-ui/src/views/system/notice/index.vue
+++ b/sgzb-ui/src/views/system/notice/index.vue
@@ -123,7 +123,7 @@
     />
 
     <!-- 添加或修改公告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="750px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
diff --git a/sgzb-ui/src/views/system/role/index.vue b/sgzb-ui/src/views/system/role/index.vue
index fb3b5ef0..4249b3b7 100644
--- a/sgzb-ui/src/views/system/role/index.vue
+++ b/sgzb-ui/src/views/system/role/index.vue
@@ -156,7 +156,7 @@
     />
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
@@ -208,7 +208,7 @@
     </el-dialog>
 
     <!-- 分配角色数据权限对话框 -->
-    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body :close-on-click-modal="false">
       <el-form :model="form" label-width="80px">
         <el-form-item label="角色名称">
           <el-input v-model="form.roleName" :disabled="true" />
diff --git a/sgzb-ui/src/views/system/user/index.vue b/sgzb-ui/src/views/system/user/index.vue
index 1d1beb5f..67ba555b 100644
--- a/sgzb-ui/src/views/system/user/index.vue
+++ b/sgzb-ui/src/views/system/user/index.vue
@@ -203,7 +203,7 @@
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">