前端gjy

src/api/V2/salesManagement/index.js

@@ -1,9 +1,3 @@
-//销售订单列表
-export const API_GET_SALE_ORDER_LIST = '/saleOrder/selectSaleOrder'
-//销售订单成交
-export const API_POST_SALE_ORDER_DEAL = '/saleOrder/api/deal'
-//销售订单平仓
-export const API_POST_SALE_CLOSEPOSITION = '/saleOrder/api/closePosition'
 //销售计划列表
 export const API_GET_SALEPLAN_LIST = '/salePlanInfo/selectSalePlanInfo'
 //销售计划查看
@@ -15,4 +9,18 @@ export const API_POST_SALEPLAN_EDIT = '/salePlanInfo/api/editSalePlanInfo'
 //销售计划删除
 export const API_POST_SALEPLAN_DELETE = '/salePlanInfo/api/deleteSalePlanInfo'
 //销售状态，基差，单价修改 
-export const API_POST_SALEPLAN_EDITSTATUS = '/salePlanInfo/api/editStatus'
+export const API_POST_SALEPLAN_EDITSTATUS = '/salePlanInfo/api/editStatus' 
+//销售订单列表
+export const API_GET_SALE_ORDER_LIST = '/saleOrder/selectSaleOrder'
+//销售订单成交
+export const API_POST_SALE_ORDER_DEAL = '/saleOrder/api/deal'
+//销售订单平仓
+export const API_POST_SALE_CLOSEPOSITION = '/saleOrder/api/closePosition'
+//销售订单审核编辑
+export const API_POST_ADUIT_SALE = '/saleOrder/api/editSaleOrder'
+//销售订单合同编号下拉列表
+export const API_GET_ADUIT_CONTRACTNO = '/warehouseBaseInfo/selectContractNoList'
+//销售订单flag0 补充定金 1解冻定金 2完成 3更改基差
+export const API_POST_EDITSTATUS = '/saleOrder/api/editStatus'
+//销售订单删除
+export const API_POST_DELETESALE = '/saleOrder/api/deleteSaleOrder'

src/model/salesManagement/index.js

@@ -4,6 +4,10 @@ import {
     API_GET_SALE_ORDER_LIST,
     API_POST_SALE_ORDER_DEAL,
     API_POST_SALE_CLOSEPOSITION,
+    API_POST_ADUIT_SALE,
+    API_GET_ADUIT_CONTRACTNO,
+    API_POST_EDITSTATUS,
+    API_POST_DELETESALE,
     API_GET_SALEPLAN_LIST,
     API_GET_SALEPLAN_LOOK,
     API_POST_SALEPLAN_ADD,
@@ -12,11 +16,11 @@ import {
     API_POST_SALEPLAN_EDITSTATUS,
 } from '@/api/V2/salesManagement'
 // import { API_GET_PROCUREMENT_LOOK } from '../../api/V2/purchasingManagement'
-//销售详情列表
+//销售订单列表
 export const detailsList = appRx.get(API_GET_SALE_ORDER_LIST, errorCatcher, errorHandle, filter)
-//销售详情成交
+//销售订单成交
 export const chengList = appRx.post(API_POST_SALE_ORDER_DEAL, errorCatcher, errorHandle, filter)
-//销售详情平仓
+//销售订单平仓
 export const closePositionList = appRx.post(API_POST_SALE_CLOSEPOSITION, errorCatcher, errorHandle,filter)
 //销售计划列表
 export const salePlan = appRx.get(API_GET_SALEPLAN_LIST,errorCatcher, errorHandle, filter)
@@ -30,3 +34,11 @@ export const saleEdit = appRx.post(API_POST_SALEPLAN_EDIT, errorCatcher, errorHa
 export const saleDel = appRx.post(API_POST_SALEPLAN_DELETE, errorCatcher,errorHandle,filter)
 //销售状态，基差，单价修改
 export const saleEditOther = appRx.post(API_POST_SALEPLAN_EDITSTATUS, errorCatcher,errorHandle,filter)
+//销售订单审核
+export const aduitsale = appRx.post(API_POST_ADUIT_SALE, errorCatcher,errorHandle,filter)
+//销售订单合同编号下拉列表
+export const aduitcontractno = appRx.get(API_GET_ADUIT_CONTRACTNO, errorCatcher,errorHandle,filter)
+//销售订单flag0 补充定金 1解冻定金 2完成 3更改基差
+export const editStatus = appRx.post(API_POST_EDITSTATUS, errorCatcher,errorHandle,filter)
+//销售订单删除
+export const deletesale = appRx.post(API_POST_DELETESALE, errorCatcher,errorHandle,filter)

src/views/customer/customerList.vue

@@ -35,12 +35,13 @@
         >
           默认定金比例</el-button
         >
-        <WinseaContentModal
-          v-model="outerVisibleDefaultEdit"
+        <el-dialog
+          width="25%"
           title="设置默认定金比例"
-          @on-cancel="handleClose"
+          :visible.sync="outerVisibleDefaultEdit"
+          :append-to-body="true"
         >
-          <div style="width: 90%">
+          <div style="width: 50%">
             <div class="dingjin">定金比例(元/吨)</div>
             <el-input
               type="textarea"
@@ -50,43 +51,22 @@
             >
             </el-input>
           </div>
-          <div class="dialog-footer">
+          <div slot="footer" class="dialog-footer">
             <el-button @click="outerVisibleDefaultEdit = false"
               >取 消</el-button
             >
-            <el-button type="primary" @click="editDepositRatio()"
-              >确定</el-button
+            <el-button type="primary" @click="editDefaultDepositRatio()"
+              >确 定</el-button
             >
           </div>
-        </WinseaContentModal>
-
-        <!--修改定金比例-->
-        <WinseaContentModal
-          v-model="outerVisibleEdit"
-          title="修改定金比例"
-          @on-cancel="handleClose"
-        >
-          <div style="width: 90%" class="xiugai">
-            <el-input
-              type="textarea"
-              :rows="2"
-              maxlength="30"
-              placeholder="请输入定金比例"
-              v-model="depositRatio"
-            >
-            </el-input>
-          </div>
-          <div class="dialog-footer">
-            <el-button @click="outerVisibleEdit = false">取 消</el-button>
-            <el-button type="primary" @click="editPrice(0)">确定</el-button>
-          </div>
-        </WinseaContentModal>
+        </el-dialog>
 
         <!--增加定金-->
-        <WinseaContentModal
-          v-model="outerVisibleAdd"
+        <el-dialog
+          width="30%"
           title="增加定金"
-          @on-cancel="handleClose"
+          :visible.sync="outerVisibleAdd"
+          :append-to-body="true"
         >
           <div class="addprice">
             已付定金
@@ -95,7 +75,7 @@
             </div>
           </div>
           <div class="addpricejine">增加金额</div>
-          <div style="width: 90%" class="zengjia">
+          <div style="width: 50%" class="zengjia">
             <el-input
               type="textarea"
               :rows="2"
@@ -106,17 +86,18 @@
             </el-input>
             <div class="yuan">元</div>
           </div>
-          <div class="dialog-footer">
+          <div slot="footer" class="dialog-footer">
             <el-button @click="outerVisibleAdd = false">取 消</el-button>
-            <el-button type="primary" @click="editPrice(1)">确定</el-button>
+            <el-button type="primary" @click="editPrice(1)">确 定</el-button>
           </div>
-        </WinseaContentModal>
+        </el-dialog>
 
         <!--退回定金-->
-        <WinseaContentModal
-          v-model="outerVisibleReturn"
+        <el-dialog
+          width="30%"
           title="退回定金"
-          @on-cancel="handleClose"
+          :visible.sync="outerVisibleReturn"
+          :append-to-body="true"
         >
           <div class="returnprice">
             可退定金
@@ -127,7 +108,7 @@
             </div>
           </div>
           <div class="returnpricejine">退回金额</div>
-          <div style="width: 90%" class="tuihui">
+          <div style="width: 50%" class="tuihui">
             <el-input
               type="textarea"
               :rows="2"
@@ -138,11 +119,11 @@
             </el-input>
             <div class="yuan">元</div>
           </div>
-          <div class="dialog-footer">
+          <div slot="footer" class="dialog-footer">
             <el-button @click="outerVisibleReturn = false">取 消</el-button>
-            <el-button type="primary" @click="editPrice(2)">确定</el-button>
+            <el-button type="primary" @click="editPrice(2)">确 定</el-button>
           </div>
-        </WinseaContentModal>
+        </el-dialog>
       </template>
     </BaseHeaderLayout>
     <div>
@@ -196,19 +177,41 @@
         </el-table-column>
         <el-table-column prop="freezingDeposit" label="冻结定金(元)">
         </el-table-column>
-        <el-table-column prop="depositRatio" label="定金比例(元/吨)">
+        <el-table-column
+          class="table_td"
+          prop="depositRatio"
+          label="定金比例(元/吨)"
+        >
           <template slot-scope="scope">
-            {{ scope.row.depositRatio }}
+            <div class="inputChenge">
+              <!-- readonly -->
+              <el-input
+                v-model="scope.row.depositRatio"
+                v-if="scope.row.identification == 'true'"
+              ></el-input>
+              <div v-if="scope.row.identification == 'false'" class="inputs">
+                {{ scope.row.depositRatio }}
+              </div>
+            </div>
             <img
               width="17"
               height="18"
               style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png"
-              @click="editClick(0, scope.row)"
+              @click="whether(scope.row)"
+              v-if="scope.row.identification == 'false'"
               alt=""
             />
+            <i
+              class="el-icon-check"
+              style="line-height: 29px; margin-left: 10px"
+              v-if="scope.row.identification == 'true'"
+              @click="varietyClick(scope.row)"
+            ></i>
+            <!-- <div>—</div> -->
           </template>
         </el-table-column>
+
         <el-table-column prop="updateDate" label="更新时间"> </el-table-column>
         <el-table-column prop="seller" label="操作" width="280">
           <template slot-scope="scope">
@@ -352,6 +355,7 @@ export default {
       }
       return fmt
     },
+
     handleClose() {
       this.accessoryTFs = false
     },
@@ -369,6 +373,66 @@ export default {
       this.searchType = state
       this.getList()
     },
+    //修改定金比例
+    varietyClick(row) {
+       if (
+        row.depositRatio < 0 ||
+        row.depositRatio > 100000 ||
+        (String(row.depositRatio).indexOf('.') != -1 &&
+          String(row.depositRatio).length -
+            (String(row.depositRatio).indexOf('.') + 1) >
+            2)
+      ) {
+        this.$message({
+          message: '定金比例输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (row.depositRatio) {
+        if (isNaN(row.depositRatio)) {
+          this.$message({
+            message: '定金比例非数字!',
+            type: 'warning',
+          })
+          return
+        }
+      }
+      if (!row.depositRatio) {
+        this.$message({
+          message: '定金比例不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      this.$confirm(`确定要修改定金比例？`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          editCustomerInfo({
+            flag: 0,
+            depositRatio: row.depositRatio,
+            id: row.id,
+          })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '修改成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {})
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    whether(row) {
+      row.identification = 'true'
+    },
     //列表查询
     getList() {
       getList({
@@ -380,17 +444,20 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          for (var i = 0; i < response.records.length; i++) {
+            response.records[i].identification = 'false'
+          }
+          this.customerList = response
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
-          this.customerList = response
         })
     },
     //设置默认定金比例
     installRatio() {
       this.outerVisibleDefaultEdit = true
     },
-    editDepositRatio() {
+    editDefaultDepositRatio() {
       if (
         this.depositRatio < 1 ||
         this.depositRatio > 100000 ||
@@ -439,13 +506,8 @@ export default {
       this.totalDeposit = row.totalDeposit
       this.freezingDeposit = row.freezingDeposit
 
-      //更改定金比例
-      if (index == 0) {
-        this.outerVisibleEdit = true
-        this.customerInfo.flag = 0
-      }
       //增加定金
-      else if (index == 1) {
+      if (index == 1) {
         this.outerVisibleAdd = true
         this.customerInfo.flag = 1
       }
@@ -462,41 +524,9 @@ export default {
       this.customerInfo.money = this.money
       this.customerInfo.totalDeposit = this.totalDeposit
       this.customerInfo.freezingDeposit = this.freezingDeposit
-      //修改定金比例
-      if (asdf == 0) {
-        if (
-          this.depositRatio < 0 ||
-          this.depositRatio > 100000 ||
-          (String(this.depositRatio).indexOf('.') != -1 &&
-            String(this.depositRatio).length -
-              (String(this.depositRatio).indexOf('.') + 1) >
-              2)
-        ) {
-          this.$message({
-            message: '定金比例输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.depositRatio) {
-          if (isNaN(this.depositRatio)) {
-            this.$message({
-              message: '定金比例非数字!',
-              type: 'warning',
-            })
-            return
-          }
-        }
-        if (!this.depositRatio) {
-          this.$message({
-            message: '定金比例不能为空！',
-            type: 'warning',
-          })
-          return
-        }
-      }
+
       //增加定金
-      else if (asdf == 1) {
+      if (asdf == 1) {
         if (
           this.money < 0 ||
           this.money > 100000000 ||
@@ -573,12 +603,9 @@ export default {
           this.outerVisibleReturn = false
           this.outerVisibleEdit = false
           this.getList()
-          //修改定金比例
-          if (asdf == 0) {
-            this.$message.success('修改定金比例成功')
-          }
+
           //增加定金
-          else if (asdf == 1) {
+          if (asdf == 1) {
             this.$message.success('增加成功')
           }
           //退回定金
@@ -727,7 +754,7 @@ export default {
 }
 /deep/.zengjia .el-textarea__inner {
   display: block;
-  padding: 13px 17px;
+  padding: 13px 9px;
   line-height: 0.5;
   box-sizing: border-box;
   width: 80%;
@@ -737,8 +764,8 @@ export default {
   background-image: none;
   border: 1px solid #dcdfe6;
   border-radius: 4px;
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
   margin-left: 180px;
+  margin-top: 10px;
 }
 
 /deep/.xiugai .el-textarea__inner {
@@ -754,12 +781,12 @@ export default {
   border: 1px solid #dcdfe6;
   border-radius: 4px;
   transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  margin-left: 0px;
+  margin-left: 95px;
 }
 
 /deep/.tuihui .el-textarea__inner {
   display: block;
-  padding: 13px 17px;
+  padding: 13px 9px;
   line-height: 0.5;
   box-sizing: border-box;
   width: 80%;
@@ -769,8 +796,8 @@ export default {
   background-image: none;
   border: 1px solid #dcdfe6;
   border-radius: 4px;
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
   margin-left: 180px;
+  margin-top: 10px;
 }
 /deep/.dingjin {
   width: 98px;
@@ -791,7 +818,8 @@ export default {
   border: 1px solid #dcdfe6;
   border-radius: 4px;
   transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  margin-left: 180px;
+  margin-left: 155px;
+  margin-top: 10px;
 }
 /deep/.addprice {
   width: 98px;
@@ -803,8 +831,8 @@ export default {
 }
 /deep/.yuan {
   width: 10px;
-  margin-left: 1400px;
-  margin-top: -36px;
+  margin-left: 150%;
+  margin-top: -32px;
 }
 /deep/.addpricejine {
   width: 98px;
@@ -824,11 +852,18 @@ export default {
 /deep/.yifudingjin {
   margin-left: 135px;
   width: 70px;
-  margin-top: -31px;
+  margin-top: -19px;
+}
+.inputChenge {
+  width: 50%;
+  display: inline-flex;
+}
+.inputs {
+  margin: 0 auto;
 }
 /deep/.ketuidingjin {
   margin-left: 135px;
   width: 70px;
-  margin-top: -31px;
+  margin-top: -19px;
 }
 </style>

src/views/purchasingManagement/procurementPlanList.vue

@@ -1,7 +1,6 @@
 //采购计划
 <template>
   <div class="container">
-
     <BaseHeaderLayout :leftSpan="10">
       <template slot="left">
         <ws-button type="primary" @click="handleAdd()">添加</ws-button>
@@ -267,7 +266,6 @@ export default {
       deptCircularPage: {},
       warehouseList: [],
       deptBudgetList: {},
-      pcFlag: 1,
       historyList: [],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -837,14 +835,13 @@ export default {
 }
 
 .base_header_layout .grid-content.right .find.el-button--primary {
-    width: 30px;
-    margin-left: 0;
-    border-top-left-radius: 0px;
-    border-bottom-left-radius: 0px;
-    margin-top: -1px;
-    margin-left: -6px;
+  width: 30px;
+  margin-left: 0;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+  margin-top: -1px;
+  margin-left: -6px;
 }
 // .inputChenge>>>.el-input__inner{
 // border: none;
-
 </style>

src/views/salesManagement/salesPlanList.vue

@@ -7,7 +7,7 @@
       <template slot="right">
         <ws-input
           v-model="searchKeyWord"
-          placeholder="可按销售计划编号和标题查找"
+          placeholder="可按采购计划编号和标题查找"
           clearable
           maxlength="500"
           type="input"
@@ -607,9 +607,11 @@ export default {
 }
 /deep/.base_header_layout .grid-content.right .find.el-button--primary {
   width: 30px;
-  margin-left: 0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    margin-top: -1px;
+    margin-left: -6px;
 }
 /deep/.findValue .el-input__inner {
   border-top-right-radius: 0px;
@@ -786,6 +788,14 @@ export default {
 .inputs1 {
   border: none;
 }
+.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    margin-top: -1px;
+    margin-left: -6px;
+}
 // .inputChenge>>>.el-input__inner{
 // border: none;
 // }

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -164,6 +164,7 @@
         row="3"
         placeholder="暂无"
         maxlength="200"
+        readonly
       />
       <div class="small-title" style="font-size: 16px">实际流转数量</div>
       <ws-info-table class="flow">