工程押金

.env.development

@@ -2,5 +2,6 @@
 ENV = 'development'
 
 # base api
-#VUE_APP_BASE_API = 'http://121.43.111.127:10005/'
-VUE_APP_BASE_API = 'http://hg.zfire.top/api/'
+# 121.43.111.127 192.168.31.6
+VUE_APP_BASE_API = 'http://121.43.111.127:10005/'
+#VUE_APP_BASE_API = 'http://hg.zfire.top/api/'

src/api/engin_deposit.js

@@ -2,7 +2,7 @@
  * @Author: howie
  * @Date: 2022-07-09 10:29:40
  * @LastEditors: howie
- * @LastEditTime: 2022-07-09 18:53:28
+ * @LastEditTime: 2022-07-11 10:48:05
  * @FilePath: \supply-front\src\api\engin_deposit.js
  * @Description:
  *
@@ -30,7 +30,7 @@ export function editInfo(params) {
   })
 }
 
-//发货信息
+//获取发货详情
 export function getListProject(params) {
   return request({
     url: '/invoice/listProject',
@@ -39,7 +39,7 @@ export function getListProject(params) {
   })
 }
 
-// 获取详情
+// 获取押金详情
 export function geDetail(params) {
   return request({
     url: '/deposit-manage/detail',
@@ -51,7 +51,7 @@ export function geDetail(params) {
 
 
 
-// 获取详情
+// 获取订单详情
 export function geOrderInfo(params) {
   return request({
     url: '/deposit-manage/query-engin-order-info',

src/views/basic_data/material/components/modify_list-apply.vue

@@ -107,7 +107,7 @@
             <el-table-column
               align="center"
               label="销售类型"
-              prop="saleTypeId"
+              prop="mainId"
               min-width="160"
               show-overflow-tooltip
             >
@@ -115,12 +115,12 @@
                 <el-form-item>
                   <el-select
                     placeholder="请选择销售类型"
-                    @change="handleSale($event, scope.$index)"
-                    v-model="scope.row.saleTypeId"
+                    @change="handleSale($event, scope.$index,scope.row.saleTypes)"
+                    v-model="scope.row.mainId"
                   >
                     <el-option
                       v-for="item in scope.row.saleTypes"
-                      :label="item.name"
+                      :label="item.saleName"
                       :value="item.mainId"
                     ></el-option>
                   </el-select>
@@ -914,14 +914,21 @@ export default {
     });
   },
   methods: {
-    handleSale(e, index) {
+    handleSale(e, index,saleTypes) {
       this.rebateList = this.rebateList.filter((k) => {
         return (
           this.typeList.filter((i) => {
+               console.log(k,i);
             return e == i.mainId;
-          })[0].saleTypeId === k.saleTypeId
+
+          })[0].id === k.saleTypeId
         );
       });
+
+      this.items[index].mainId = saleArr.mainId
+      this.items[index].mainName = saleArr.mainName
+      this.items[index].saleTypeId = saleArr.id
+      this.items[index].saleTypeName = saleName
       this.$set(this.items[index], "rebateWallets", this.rebateList);
       this.fang = false;
     },
@@ -1136,7 +1143,7 @@ export default {
           ...this.items[i].rebateWallets,
           ...this.items[i].wallets,
         ];
-        if (!this.items[i].saleTypeId) {
+        if (!this.items[i].mainId) {
           this.$errorMsg("请选择销售类型");
           return;
         }

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

@@ -6,9 +6,9 @@
     <el-divider></el-divider>
     <h3>工程项目信息</h3>
     <el-divider></el-divider>
-      <div class="diy-table-1">
-        <el-form :model="details" ref="form" >
-          <el-row :gutter="0">
+    <div class="diy-table-1">
+      <el-form :model="details" ref="form">
+        <el-row :gutter="0">
           <el-col :xs="12" :sm="8" :lg="8" class="item">
             <div class="label">工程登录编码</div>
             <div class="value">{{ details.refEnginRecordNo }}</div>
@@ -47,13 +47,12 @@
             <div class="label">厂工程编码</div>
             <div class="value">
               <el-form-item prop="refFactoryNo">
-                   <el-input
-                v-model="details.refFactoryNo"
-                placeholder="厂工程编码"
-                size="small"
-              ></el-input>
+                <el-input
+                  v-model="details.refFactoryNo"
+                  placeholder="厂工程编码"
+                  size="small"
+                ></el-input>
               </el-form-item>
-
             </div>
           </el-col>
           <el-col :xs="24" :sm="24" :lg="8" class="item">
@@ -81,133 +80,131 @@
             <div class="value"></div>
           </el-col>
           <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label" >安装时间</div>
-            <div class="value" style="padding:0">
+            <div class="label">安装时间</div>
+            <div class="value" style="padding: 0">
               <el-form-item prop="installDate">
-                 <el-date-picker
-
-                v-model="details.installDate"
-                type="datetime"
-                placeholder="安装时间"
-                default-time="00:00:00"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
+                <el-date-picker
+                  v-model="details.installDate"
+                  type="datetime"
+                  placeholder="安装时间"
+                  default-time="00:00:00"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                >
+                </el-date-picker>
               </el-form-item>
-
             </div>
           </el-col>
           <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label" >寄厂日期</div>
-            <div class="value" style="padding:0">
-            <el-form-item prop="sendFactoryDate">
-              <el-date-picker
-                v-model="details.sendFactoryDate"
-                type="datetime"
-                placeholder="寄厂日期"
-                default-time="00:00:00"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
-            </el-form-item>
+            <div class="label">寄厂日期</div>
+            <div class="value" style="padding: 0">
+              <el-form-item prop="sendFactoryDate">
+                <el-date-picker
+                  v-model="details.sendFactoryDate"
+                  type="datetime"
+                  placeholder="寄厂日期"
+                  default-time="00:00:00"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                >
+                </el-date-picker>
+              </el-form-item>
             </div>
           </el-col>
         </el-row>
-        </el-form>
-
-      </div>
+      </el-form>
+    </div>
     <h3>货品信息</h3>
     <el-divider></el-divider>
     <!-- 列表 -->
-        <div class="mymain-container">
-        <div class="table">
-          <el-table
-            v-loading="listLoading"
-            :data="details.items"
-            element-loading-text="Loading"
-            border
-            fit
-            highlight-current-row
-            stripe
-          >
-            <el-table-column
-              align="center"
-              label="物料编码"
-              prop="materialNumber"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="产品编码"
-              prop="materialOldNumber"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="产品名称"
-              prop="materialName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="规格型号"
-              prop="specification"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="单价"
-              prop="price"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="数量"
-              prop="qty"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="金额"
-              prop="totalAmount"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="发货数量"
-              prop="hasSendQty"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="押金金额"
-              prop="depositAmount"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="上交资料"
-              prop="dataQty"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="收差全额"
-              prop="diffAmount"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-          </el-table>
+    <div class="mymain-container">
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="details.items"
+          element-loading-text="Loading"
+          border
+          fit
+          show-summary
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            align="center"
+            label="物料编码"
+            prop="materialNumber"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="产品编码"
+            prop="materialOldNumber"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="产品名称"
+            prop="materialName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="规格型号"
+            prop="specification"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="单价"
+            prop="price"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="数量"
+            prop="qty"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="金额"
+            prop="totalAmount"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="发货数量"
+            prop="hasSendQty"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="押金金额"
+            prop="depositAmount"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="上交资料"
+            prop="dataQty"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="收差全额"
+            prop="diffAmount"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
       </div>
     </div>
     <h3>上传资料</h3>
@@ -224,29 +221,35 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="24">
             <el-form-item label="工程验收资料" prop="">
-              <fileUpload :fileList="fileList" />
+              <imageUpload :fileList="fileList"  :multiple="true"/>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="申请人" prop="submitBy">
-              <el-input v-model="details.submitBy" placeholder="请输入"></el-input>
+              <el-input
+                v-model="details.submitBy"
+                placeholder="请输入"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="申请日期" prop="submitTime">
               <el-date-picker
-              v-model="details.submitTime "
+                v-model="details.submitTime"
                 class="dateStyle"
-                type="date"
+                type="datetime"
                 placeholder="选择日期"
+                   default-time="00:00:00"
+                  value-format="yyyy-MM-dd HH:mm:ss"
               >
               </el-date-picker>
+
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="18">
             <el-form-item label="申请退押" prop="applyNote">
               <el-input
-              v-model="details.applyNote"
+                v-model="details.applyNote"
                 type="textarea"
                 placeholder="请输入"
                 class="textareaStyle"
@@ -255,8 +258,12 @@
           </el-col>
           <el-col :xs="24" :sm="24" :lg="24">
             <el-form-item label="">
-              <el-button type="primary" size="small" @click="handleSvse">保存</el-button>
-            <el-button type="primary" size="small" @click="handleReset">重置</el-button>
+              <el-button type="primary" size="small" @click="handleSvse"
+                >保存</el-button
+              >
+              <el-button type="primary" size="small" @click="handleReset"
+                >重置</el-button
+              >
             </el-form-item>
           </el-col>
         </el-row>
@@ -266,38 +273,50 @@
 </template>
 
 <script>
-import { geDetail,applyDeposit } from "@/api/engin_deposit.js";
+import { geDetail, applyDeposit } from "@/api/engin_deposit.js";
 
-import fileUpload from "@/components/Common/file-upload.vue";
+import imageUpload from "@/components/Common/image-upload.vue";
 export default {
   components: {
-    fileUpload,
-
+    imageUpload,
   },
   data() {
     return {
+      listLoading:false,
+      baseURL: process.env.VUE_APP_BASE_API,
       fileList: [],
-       details:{}
+      details: {},
     };
   },
   created() {
-     geDetail({ id: this.$parent.depositManageId }).then((res) => {
-          this.details = res.data;
-        });
+    geDetail({ id: this.$parent.depositManageId }).then((res) => {
+      this.details = res.data;
+    });
   },
   methods: {
     goBack() {
       this.$parent.showPage = 1;
     },
-    handleSvse(){
-      applyDeposit(this.details).then(res=>{
-          this.$successMsg('申请成功')
-          this.$parent.showPage = 1;
-      })
+    handleSvse() {
+      console.log();
+        this.fileList.forEach(el => {
+            this.details.dataList.push({
+              dataDescribe:el.name,
+              enginOrderNo:this.details.refProjectNo,
+              fileName:el.name,
+              fileUrl:el.url,
+
+            })
+        });
+
+      applyDeposit(this.details).then((res) => {
+        this.$successMsg("申请成功");
+        this.$parent.showPage = 1;
+      });
+    },
+    handleReset() {
+      this.$refs.form.resetFields();
     },
-    handleReset(){
-      this.$refs.form.resetFields()
-    }
   },
 };
 </script>
@@ -312,4 +331,27 @@ export default {
 .dateStyle {
   width: 100%;
 }
+::v-deep .el-input__prefix {
+  display: none;
+  left: 65px !important;
+  -webkit-transition: all 0.3s;
+  transition: all 0.3s;
+}
+::v-deep .el-date-editor.el-input {
+  width: 100%;
+  box-sizing: border-box;
+  padding-left: 10px;
+}
+.diy-table-1 {
+  ::v-deep .el-form-item {
+    margin: 0;
+  }
+  ::v-deep .el-input__suffix {
+  right: -15px;
+  -webkit-transition: all 0.3s;
+  transition: all 0.3s;
+}
+}
+
+
 </style>

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

@@ -13,116 +13,110 @@
 
     <div v-show="engineering == '工程押金信息'">
       <div class="diy-table-1">
-        <el-form :model="details" ref="form" >
+        <el-form :model="details" ref="form">
           <el-row :gutter="0">
-          <el-col :xs="12" :sm="8" :lg="8" class="item">
-            <div class="label">工程登录编码</div>
-            <div class="value">{{ details.refEnginRecordNo }}</div>
-          </el-col>
-          <el-col :xs="12" :sm="8" :lg="8" class="item">
-            <div class="label">工程名称(项目名称)</div>
-            <div class="value">{{ details.refProjectName }}</div>
-          </el-col>
-          <el-col :xs="12" :sm="8" :lg="8" class="item">
-            <div class="label">工程编号</div>
-            <div class="value">{{ details.refProjectNo }}</div>
-          </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label">经销商名称</div>
-            <div class="value">{{ details.customerName }}</div>
-          </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label">经销商编码</div>
-            <div class="value">{{ details.customerId }}</div>
-          </el-col>
-
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label">工程登录类型</div>
-            <div class="value">{{ details.refPromiseStatus }}</div>
-          </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label">联系人</div>
-            <div class="value">{{ details.refLinkman }}</div>
-          </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label">固定电话</div>
-            <div class="value">{{ details.refTel }}</div>
-          </el-col>
-
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label">厂工程编码</div>
-            <div class="value">
-              <el-form-item prop="refFactoryNo">
-                   <el-input
-                v-model="details.refFactoryNo"
-                placeholder="厂工程编码"
-                size="small"
-              ></el-input>
-              </el-form-item>
-
-            </div>
-          </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label"></div>
-            <div class="value"></div>
-          </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label">移动电话</div>
-            <div class="value">{{ details.refPhone }}</div>
-          </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label">押金总额</div>
-            <div class="value">{{ details.depositAmount }}</div>
-          </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label">工程差价总额</div>
-            <div class="value">{{ details.depositDiffAmount }}</div>
-          </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label">使用单位</div>
-            <div class="value">{{ details.refUseUnit }}</div>
-          </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label"></div>
-            <div class="value"></div>
-          </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label" >安装时间</div>
-            <div class="value" style="padding:0">
-              <el-form-item prop="installDate">
-                 <el-date-picker
-
-                v-model="details.installDate"
-                type="datetime"
-                placeholder="安装时间"
-                default-time="00:00:00"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
-              </el-form-item>
-
-            </div>
-          </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label" >寄厂日期</div>
-            <div class="value" style="padding:0">
-            <el-form-item prop="sendFactoryDate">
-              <el-date-picker
-                v-model="details.sendFactoryDate"
-                type="datetime"
-                placeholder="寄厂日期"
-                default-time="00:00:00"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
-            </el-form-item>
+            <el-col :xs="12" :sm="8" :lg="8" class="item">
+              <div class="label">工程登录编码</div>
+              <div class="value">{{ details.refEnginRecordNo }}</div>
+            </el-col>
+            <el-col :xs="12" :sm="8" :lg="8" class="item">
+              <div class="label">工程名称(项目名称)</div>
+              <div class="value">{{ details.refProjectName }}</div>
+            </el-col>
+            <el-col :xs="12" :sm="8" :lg="8" class="item">
+              <div class="label">工程编号</div>
+              <div class="value">{{ details.refProjectNo }}</div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="8" class="item">
+              <div class="label">经销商名称</div>
+              <div class="value">{{ details.customerName }}</div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="8" class="item">
+              <div class="label">经销商编码</div>
+              <div class="value">{{ details.customerId }}</div>
+            </el-col>
 
+            <el-col :xs="24" :sm="24" :lg="8" class="item">
+              <div class="label">工程登录类型</div>
+              <div class="value">{{ details.refPromiseStatus }}</div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="8" class="item">
+              <div class="label">联系人</div>
+              <div class="value">{{ details.refLinkman }}</div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="8" class="item">
+              <div class="label">固定电话</div>
+              <div class="value">{{ details.refTel }}</div>
+            </el-col>
 
-            </div>
-          </el-col>
-        </el-row>
+            <el-col :xs="24" :sm="24" :lg="8" class="item">
+              <div class="label">厂工程编码</div>
+              <div class="value">
+                <el-form-item prop="refFactoryNo">
+                  <el-input
+                    v-model="details.refFactoryNo"
+                    placeholder="厂工程编码"
+                    size="small"
+                  ></el-input>
+                </el-form-item>
+              </div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="8" class="item">
+              <div class="label"></div>
+              <div class="value"></div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="8" class="item">
+              <div class="label">移动电话</div>
+              <div class="value">{{ details.refPhone }}</div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="8" class="item">
+              <div class="label">押金总额</div>
+              <div class="value">{{ details.depositAmount }}</div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="8" class="item">
+              <div class="label">工程差价总额</div>
+              <div class="value">{{ details.depositDiffAmount }}</div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="8" class="item">
+              <div class="label">使用单位</div>
+              <div class="value">{{ details.refUseUnit }}</div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="8" class="item">
+              <div class="label"></div>
+              <div class="value"></div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="8" class="item">
+              <div class="label">安装时间</div>
+              <div class="value" style="padding: 0">
+                <el-form-item prop="installDate">
+                  <el-date-picker
+                    v-model="details.installDate"
+                    type="datetime"
+                    placeholder="安装时间"
+                    default-time="00:00:00"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="8" class="item">
+              <div class="label">寄厂日期</div>
+              <div class="value" style="padding: 0">
+                <el-form-item prop="sendFactoryDate">
+                  <el-date-picker
+                    v-model="details.sendFactoryDate"
+                    type="datetime"
+                    placeholder="寄厂日期"
+                    default-time="00:00:00"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </div>
+            </el-col>
+          </el-row>
         </el-form>
-
       </div>
       <h3>货品信息</h3>
       <el-divider></el-divider>
@@ -264,9 +258,13 @@
           </el-col>
         </el-row>
       </div>
-      <div style="margin:20px 0">
-        <el-button type="primary" size="small" @click="handleSvse">保存</el-button>
-        <el-button type="primary" size="small" @click="handleReset">重置</el-button>
+      <div style="margin: 20px 0">
+        <el-button type="primary" size="small" @click="handleSvse"
+          >保存</el-button
+        >
+        <el-button type="primary" size="small" @click="handleReset"
+          >重置</el-button
+        >
       </div>
     </div>
     <div v-show="engineering == '工程订单信息'">
@@ -352,7 +350,7 @@
             highlight-current-row
             stripe
           >
-             <el-table-column
+            <el-table-column
               align="center"
               label="发货单"
               prop="id"
@@ -401,9 +399,12 @@
               min-width="160"
               show-overflow-tooltip
             >
-            <template slot-scope="scope">
-              {{(scope.row.refundableQty||0) * (scope.row.singleDepositAmount||0) }}
-            </template>
+              <template slot-scope="scope">
+                {{
+                  (scope.row.refundableQty || 0) *
+                  (scope.row.singleDepositAmount || 0)
+                }}
+              </template>
             </el-table-column>
           </el-table>
         </div>
@@ -413,14 +414,19 @@
 </template>
 
 <script>
-import { geDetail, geOrderInfo, editInfo,getListProject } from "@/api/engin_deposit.js";
+import {
+  geDetail,
+  geOrderInfo,
+  editInfo,
+  getListProject,
+} from "@/api/engin_deposit.js";
 export default {
   data() {
     return {
       listLoading: false,
       engineering: "工程押金信息",
       dataList: [],
-      projectList:[],
+      projectList: [],
       details: {},
     };
   },
@@ -440,9 +446,13 @@ export default {
           }
         );
       } else {
-        getListProject({pageSize:-1,pageNum:1 ,refEnginRecordNo: this.$parent.refEnginRecordNo}).then(res=>{
-          this.projectList = res.data.records
-        })
+        getListProject({
+          pageSize: -1,
+          pageNum: 1,
+          refEnginRecordNo: this.$parent.refEnginRecordNo,
+        }).then((res) => {
+          this.projectList = res.data.records;
+        });
       }
     },
     goBack() {
@@ -451,16 +461,17 @@ export default {
     handleRadio(e) {
       this.getDetail();
     },
-    handleSvse(){
-      this.details.isRefundDeposit = this.details.isRefundDeposit == true ?true :false
-      editInfo(this.details).then(res=>{
-          this.$successMsg('编辑成功')
-          this.$parent.showPage = 1;
-      })
+    handleSvse() {
+      this.details.isRefundDeposit =
+        this.details.isRefundDeposit == true ? true : false;
+      editInfo(this.details).then((res) => {
+        this.$successMsg("编辑成功");
+        this.$parent.showPage = 1;
+      });
+    },
+    handleReset() {
+      this.$refs.form.resetFields();
     },
-    handleReset(){
-      this.$refs.form.resetFields()
-    }
   },
 };
 </script>
@@ -468,16 +479,23 @@ export default {
 <style scoped lang="scss">
 ::v-deep .el-input__prefix {
   display: none;
-    left: 65px !important;
-    -webkit-transition: all .3s;
-    transition: all .3s;
+  left: 65px !important;
+  -webkit-transition: all 0.3s;
+  transition: all 0.3s;
 }
-::v-deep .el-date-editor.el-input{
+::v-deep .el-date-editor.el-input {
   width: 100%;
   box-sizing: border-box;
   padding-left: 10px;
 }
-::v-deep .el-form-item{
-  margin: 0;
+.diy-table-1 {
+  ::v-deep .el-form-item {
+    margin: 0;
+  }
+}
+::v-deep .el-input__suffix {
+  right: -15px;
+  -webkit-transition: all 0.3s;
+  transition: all 0.3s;
 }
 </style>

src/views/engin_deposit/deposit_list.vue

@@ -244,7 +244,7 @@
                 <el-button type="text" class="textColor" @click="detailFn(scope.row)"
                   >详情</el-button
                 >
-                <el-button type="text" class="textColor"  @click="surrenderFn(scope.row)"
+                <el-button type="text" class="textColor"  v-if="scope.row.examineStatus == 'SAVE'" @click="surrenderFn(scope.row)"
                   >申请退押</el-button
                 >
                 <!-- <el-button type="text" class="textColor" slot="reference"

src/views/login/index.vue

@@ -172,12 +172,12 @@
           </div>
         </el-form>
       </div>
-      <div class="info">
+      <div class="info" >
         <div class="info-item">
           <a :href="companyList[0].icpRecordLink">{{
             companyList[0].icpRecord
           }}</a>
-          <div style="margin: 0 20px">|</div>
+          <div style="margin: 0 20px" v-if=" companyList[0].companyName && companyList[0].icpRecordLink">|</div>
           <a :href="companyList[0].pubSecurityRecordLink">
           <el-image
             style="width: 14px; height: 16px;"

src/views/sales_policy/components/AddCondition.vue

@@ -559,8 +559,7 @@ export default {
       };
       addPoliyCondition(params).then((res) => {
         this.$successMsg("添加成功");
-
-        this.newConditionBox = this.conditList;
+        this.newConditionBox.push(this.conditionBox)
         this.conditionBox = [[], []];
         this.conditionBoxs = [];
         this.limit = "";
@@ -585,14 +584,15 @@ export default {
       console.log(this.ids);
     },
     handleDeleteRow(index) {
-      if (this.arrIndex == index && this.ids.length) {
-        for (let i = 0; i < this.conditionBox[index].length; i++) {
-          for (let j = 0; j < this.ids.length; j++) {
-            if (this.conditionBox[index][i].id == this.ids[j]) {
-              this.conditionBox[index].splice(i, 1);
+        if (this.arrIndex == index && this.ids.length) {
+          var arr=[];
+          for(var i = 0; i < this.conditionBox[index].length; i++){
+                if(this.ids.indexOf(this.conditionBox[index][i].id) == -1){
+                    arr.push(this.conditionBox[index][i]);
+                }
             }
-          }
-        }
+        this.conditionBox[index] = []
+        this.$set(this.conditionBox,index,arr)
       }
     },
     // 更改每页数量
@@ -623,8 +623,13 @@ export default {
         for (let j = 0; j < this.conditionBox.length; j++) {
           datas = [...datas, ...this.conditionBox[j]];
         }
-        const newData = datas.length ? datas : this.newConditionBox;
-        console.log(newData, "newData");
+
+          console.log(this.newConditionBox);
+          if (this.newConditionBox.length) {
+                 console.log(this.newConditionBox);
+                 this.conditList=[]
+          } else {
+        const newData = datas
         if (newData.length) {
           for (let i = 0; i < res.data.records.length; i++) {
             for (let k = 0; k < newData.length; k++) {
@@ -636,6 +641,9 @@ export default {
         }
         this.conditList = res.data.records;
         this.listTotal = res.data.total;
+          }
+
+
       });
     },
     handleSelectionAllChange(e) {
@@ -664,15 +672,14 @@ export default {
     handleAdd() {
       this.conditList2 = this.leftData;
     },
+    //去掉相同数据
+    resArr(arr1, arr2) {
+      return arr1.filter((v) => arr2.every((val) => val.id!= v.id));
+    },
     handleDelete() {
       if (this.type == 2) {
-        for (let k = 0; k < this.conditList2.length; k++) {
-          for (let i = 0; i < this.rightData.length; i++) {
-            if (this.rightData[i].id == this.rightData[k].id) {
-              this.conditList2.splice(i, 1);
-            }
-          }
-        }
+        this.conditList2 = this.resArr(this.conditList2,this.rightData)
+        this.rightData = [];
       }
     },
     handleDiaSubmit() {

src/views/sales_policy/components/AddPolicy.vue

@@ -493,6 +493,7 @@ export default {
       const formData = new FormData();
       formData.append("file", file);
       formData.append("policyId", this.searchForm.code);
+        formData.append("mainId", this.searchForm.mainId);
       let result = await handleImport("/policy/material/import", formData);
       this.importLoading = false;
       this.importFileList = [];

src/views/sales_policy/components/Examine.vue

@@ -157,7 +157,7 @@
           </el-table-column>
           <el-table-column prop="name" label="限定条件" align="center">
             <template slot-scope="scope">
-              限定条件{{scope.$index+1}}
+           {{scope.row.name}}
             </template>
           </el-table-column>
          <el-table-column  label="操作" align="center"   width="80">

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

@@ -5,11 +5,8 @@
       <div class="title">提货进度</div>
     </div>
     <div class="progress-container">
-      <el-progress
-        :text-inside="true"
-        :stroke-width="26"
-        :percentage="detailData.thjd ? (detailData.thjd * 1000) / 10 : 0"
-      ></el-progress>
+          <el-progress :text-inside="true" :stroke-width="26" :percentage="detailData.thjd ? (detailData.thjd * 1000 / 10).toFixed(2) : 0"></el-progress>
+
     </div>
 
     <div class="main-title">
@@ -253,18 +250,8 @@
     </div>
     <div class="page-footer">
       <div class="footer" :class="classObj">
-        <el-button
-          type="primary"
-          @click="openDeliverDialog"
-          :disabled="detailData.examineStatus !== 'OK'"
-          >直调发货</el-button
-        >
-        <el-button
-          type="primary"
-          @click="handleFinish"
-          :disabled="detailData.examineStatus !== 'OK'"
-          >直调完成</el-button
-        >
+       <el-button :type="status?'info':'primary'" @click="openDeliverDialog" :disabled="detailData.examineStatus !== 'OK' || status">直调发货</el-button>
+        <el-button :type="status?'info':'primary'" @click="handleFinish" :disabled="detailData.examineStatus !== 'OK' || status">直调完成</el-button>
         <!-- <el-button @click="goBack">关 闭</el-button> -->
       </div>
     </div>
@@ -527,6 +514,7 @@ export default {
       positionList: [],
 
       goodsList: [],
+        status:false
     };
   },
 
@@ -561,11 +549,18 @@ export default {
     goBack() {
       this.$emit("backListFormDetail");
     },
-
+// 是否直调完成
+    directTransferStatus(val){
+      this.status =  val.retailOrderItemList.some(k=>{
+          return k.directTransferStatus == true
+        })
+        console.log(this.status,'4554545');
+    },
     // 获取详情
     getDetail() {
       getDetail({ id: this.listItem.id }).then((res) => {
         this.detailData = res.data;
+           this.directTransferStatus(res.data)
       });
     },
     // 直调完成

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

@@ -14,7 +14,16 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">订单日期</div>
-          <div class="value">{{ detailData.theTime }}</div>
+          <div class="value">
+             <el-date-picker
+            v-model="detailData.theTime"
+            type="datetime"
+            value-format="yyyy-MM-dd"
+            style="width: 100%"
+            placeholder="选择日期"
+          >
+          </el-date-picker>
+            </div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">单据状态</div>
@@ -344,6 +353,27 @@ export default {
 </script>
 
 <style scoped lang="scss">
+::v-deep .el-input__prefix {
+  display: none;
+  left: 65px !important;
+  -webkit-transition: all 0.3s;
+  transition: all 0.3s;
+}
+::v-deep .el-date-editor.el-input {
+  width: 100%;
+  box-sizing: border-box;
+  padding-left: 10px;
+}
+.diy-table-1 {
+  ::v-deep .el-form-item {
+    margin: 0;
+  }
+  ::v-deep .el-input__suffix {
+  right: -15px;
+  -webkit-transition: all 0.3s;
+  transition: all 0.3s;
+}
+}
 .detail-container {
   width: 100%;
   height: 100%;

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

@@ -46,8 +46,7 @@
             <el-date-picker
               v-model="mainForm.date"
               type="datetime"
-              :picker-options="pickerOptions"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              disabled
               style="width: 100%"
               placeholder="选择日期"
             >
@@ -234,7 +233,7 @@
             {{ scope.row.qty * scope.row.discAmount }}
           </template>
         </el-table-column>
-          <el-table-column
+        <el-table-column
           align="center"
           label="已退数量"
           prop="retiredQty"
@@ -351,6 +350,11 @@
         </el-table-column>
         <el-table-column align="center" label="操作" width="100" fixed="right">
           <template slot-scope="scope">
+            <el-button
+              type="text"
+              @click="(dialogVisible = true), (cid = scope.row.id)"
+              >修改</el-button
+            >
             <el-button type="text" @click="deleteItem(scope.$index)"
               >删除</el-button
             >
@@ -358,7 +362,27 @@
         </el-table-column>
       </el-table>
     </div>
+    <el-dialog :visible.sync="dialogVisible" width="50%">
+      <el-form label-width="80px" :inline="false" size="small">
+        <el-form-item label="单据日期" prop="date">
+          <el-date-picker
+            v-model="mainForm.date"
+            type="datetime"
+            value-format="yyyy-MM-dd"
+            style="width: 100%"
+            placeholder="选择日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
 
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="hendleEdit"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm">保 存</el-button>
@@ -394,7 +418,7 @@
                   placeholder="选择销售政策"
                   @change="handlePolicy"
                   filterable
-                  :disabled="goodsList.length ? true : false"
+                  :disabled="disabled"
                   style="width: 100%"
                 >
                   <el-option
@@ -453,7 +477,8 @@
           </el-row>
         </el-form>
         <el-row :gutter="20" style="margin: 10px 0">
-          {{cusIndex>0?'选择配提机型':'选择限定机型'}} {{'('+pop+')'}}
+          {{ cusIndex > 0 ? "选择配提机型" : "选择限定机型" }}
+          {{ "(" + pop + ")" }}
         </el-row>
         <el-table
           v-loading="listLoading"
@@ -587,6 +612,7 @@ export default {
       total: 0,
       radio: "",
       pop: "",
+      dialogVisible: false,
       factor: [],
       popArr: [],
       mainForm: {
@@ -600,9 +626,6 @@ export default {
         policyId: "",
       },
       mainFormRules: {
-        date: [
-          { required: true, message: "请选择单据日期", trigger: "change" },
-        ],
         type: [{ required: true, message: "请选择品类", trigger: "change" }],
       },
       goodsList: [],
@@ -669,6 +692,8 @@ export default {
       policyConditionId: "",
       multipleSelection: [],
       multipleData: [],
+      disabled: false,
+      cid: "",
     };
   },
 
@@ -713,13 +738,13 @@ export default {
         }
       };
     },
-    pickerOptions({ $props }) {
-      return {
-        disabledDate: (time) => {
-          return time.getTime() < Date.now() - 1 * 24 * 60 * 60 * 1000;
-        },
-      };
-    },
+    // pickerOptions({ $props }) {
+    //   return {
+    //     disabledDate: (time) => {
+    //       return time.getTime() < Date.now() - 1 * 24 * 60 * 60 * 1000;
+    //     },
+    //   };
+    // },
   },
 
   created() {
@@ -740,14 +765,30 @@ export default {
     // 选择销售政策获取政策条件列表
     handlePolicy(e) {
       this.factor = [];
-      this.popDataArr = []
-      this.total = 0
+      this.popDataArr = [];
+      this.total = 0;
       this.screenForm.factorId = "";
       // 选择销售政策PolidcyId改变获取条件列表
       getPolicyConditionList({ policyId: e }).then((res) => {
         this.factor = res.data;
       });
     },
+    hendleEdit(val, index) {
+      let params = {
+        id: this.cid,
+        theTime: this.mainForm.date,
+        mainId: this.mainForm.type,
+        mainName: this.mainForm.mainName,
+        remark: this.mainForm.remark,
+        type: 2,
+        retailOrderItemList: this.goodsList,
+        policyId: this.policyId,
+      };
+      editData(params).then((res) => {
+        this.$successMsg("编辑成功");
+        this.getDetail();
+      });
+    },
     //获取条件相对应的比列
     handleFactor(e) {
       const data = this.factor.filter((k) => {
@@ -805,6 +846,7 @@ export default {
     handleCondition() {
       if (this.multipleSelection.length) {
         this.cusIndex += 1;
+        this.disabled = true;
         this.multipleData.push(this.multipleSelection);
         console.log(this.multipleData, "push", this.cusIndex);
         this.getConditionList(this.policyConditionId, this.cusIndex + 1);
@@ -832,6 +874,7 @@ export default {
     // 上一步
     handleShang() {
       this.cusIndex -= 1;
+      this.cusIndex == 0 ? (this.disabled = false) : "";
       this.multipleData.splice(this.cusIndex, 1);
     },
     // 条件数据多选
@@ -847,11 +890,11 @@ export default {
         for (let i = 0; i < this.multipleData.length; i++) {
           arrData = [...arrData, ...this.multipleData[i]];
         }
-          if (this.goodsList.length) {
-            this.goodsList = [...this.goodsList,...arrData];
-          }else{
-            this.goodsList = arrData
-          }
+        if (this.goodsList.length) {
+          this.goodsList = [...this.goodsList, ...arrData];
+        } else {
+          this.goodsList = arrData;
+        }
         this.goodsList.forEach((item) => {
           this.$set(item, "status1", "");
           this.$set(item, "status2", "");
@@ -859,7 +902,7 @@ export default {
         this.cusIndex = 0;
         this.total = 0;
         this.popDataArr = [];
-        this.multipleData=[]
+        this.multipleData = [];
         this.policyId = this.screenForm.policyId;
         this.isShowDialog = false;
       } else {
@@ -885,7 +928,7 @@ export default {
       policyList({
         pageNum: 1,
         pageSize: -1,
-        status:true
+        status: true,
       }).then((res) => {
         this.screenForm.policyId = res.data.records[0].code;
         this.handlePolicy(this.screenForm.policyId);
@@ -1055,8 +1098,6 @@ export default {
       this.getGoodsList();
     },
 
-
-
     // 关闭 弹窗
     closeDialog() {
       this.isShowDialog = false;
@@ -1112,7 +1153,7 @@ export default {
 
       this.getConditionList(this.policyConditionId, this.cusIndex + 1);
     },
- // 更改列表当前页
+    // 更改列表当前页
     handleTableCurrentChange(val) {
       this.currentPage = val;
       this.getConditionList(this.policyConditionId, this.cusIndex + 1);
@@ -1187,7 +1228,7 @@ export default {
               findElem(this.typeList, "dictCode", this.mainForm.type)
             ].dictValue;
           let params = {
-            theTime: this.mainForm.date + " 00:00:00",
+            theTime: this.mainForm.date,
             mainId: this.mainForm.type,
             mainName,
             remark: this.mainForm.remark,

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

@@ -115,7 +115,7 @@
         </el-row>
       </div>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="openDirectDialog" :disabled="detailData.examineStatus !== 'OK'">提前开票</el-button>
@@ -545,4 +545,4 @@ export default {
       width: 500px;
     }
   }
-</style>
+</style>