1

src/components/byTable/index.vue

@@ -59,10 +59,10 @@
           <div v-if="i.type" class="selectTime" style="display:flex;align-items:center">
             <span style="font-size:14px;height:32px;margin-right:15px">{{i.label || ''}}</span>
             <el-date-picker v-model="pagination[i.prop]" type="date" size="small" :placeholder="i.placeholder" style="width:120px"
-                            value-format="YYYY-MM-DD" @change="searchItemSelctOne(i,pagination[i.prop],pagination[i.propOne])" />
+                            value-format="YYYY-MM-DD HH:mm:ss" @change="searchItemSelctOne(i,pagination[i.prop],pagination[i.propOne])" />
             <span style="margin-right:25px">-</span>
             <el-date-picker v-model="pagination[i.propOne]" type="date" size="small" :placeholder="i.placeholderOne" style="width:120px"
-                            value-format="YYYY-MM-DD" @change="searchItemSelctOne(i,pagination[i.prop],pagination[i.propOne])" />
+                            value-format="YYYY-MM-DD HH:mm:ss" @change="searchItemSelctOne(i,pagination[i.prop],pagination[i.propOne])" />
           </div>
           <div v-else>
             <div class="by-dropdown-title">
@@ -510,11 +510,19 @@ export default defineComponent({
 
     const searchItemSelctOne = (item, prop, propOne) => {
       if (prop && propOne) {
+        let str = "";
+        let end = "";
+        if (prop.includes(":")) {
+          str = prop.substr(0, 10);
+        }
+        if (propOne.includes(":")) {
+          end = propOne.substr(0, 10);
+        }
         proxy.$emit(
           "getList",
           Object.assign(props.filterParams, {
-            [item.prop]: prop + " 00:00:00",
-            [item.propOne]: propOne + " 23:59:59",
+            [item.prop]: str + " 00:00:00",
+            [item.propOne]: end + " 23:59:59",
           })
         );
       } else if (prop == null && propOne == null) {

src/components/headerBar/header-bar.vue

@@ -864,7 +864,7 @@ const plugDowload = () => {
           height: 40px;
           line-height: 40px;
           // border-bottom: 1px solid #efebeb;
-          font-size: 12px;
+          font-size: 13px;
           width: 140px;
           margin: 0 5vw 0 0;
 
@@ -878,7 +878,7 @@ const plugDowload = () => {
           // padding-left: 10px;
           height: 30px;
           line-height: 30px;
-          font-size: 12px;
+          font-size: 13px;
           font-weight: 400;
         }
 
@@ -904,7 +904,7 @@ const plugDowload = () => {
 
       .item {
         // margin-bottom: 4px;
-        font-size: 12px;
+        font-size: 13px;
         display: flex;
         justify-content: space-between;
         align-items: center;

src/views/EHSD/saleContract/priceSheetEHSD/index.vue

@@ -421,13 +421,16 @@
       <PriceSheetDetailList :rowData="detailRowData" dataType="1" @changeLeftData="changeLeftData"></PriceSheetDetailList>
       <template #footer>
         <el-button @click="detailDialog = false" size="defualt" v-debounce>关 闭</el-button>
-        <el-button type="primary" v-debounce v-if="leftRowData.quotationStatus==2 && !leftRowData.extQuotationId &&leftRowData.status !=88"
+        <el-button type="primary" v-debounce
+                   v-if="leftRowData.quotationStatus==2 && !leftRowData.extQuotationId &&leftRowData.status !=88 &&leftRowData.status !=70"
                    @click="handleBack(leftRowData)">退回</el-button>
-        <el-button type="primary" v-debounce v-if="leftRowData.status == 30 && leftRowData.quotationStatus==2 && leftRowData.status !=88"
+        <el-button type="primary" v-debounce
+                   v-if="leftRowData.status == 30 && leftRowData.quotationStatus==2 && leftRowData.status !=88 &&leftRowData.status !=70"
                    @click="getDtl(leftRowData, false,true)">变更</el-button>
-        <el-button type="primary" v-debounce v-if="leftRowData.quotationStatus==2 && !leftRowData.extQuotationId &&leftRowData.status !=88"
+        <el-button type="primary" v-debounce
+                   v-if="leftRowData.quotationStatus==2 && !leftRowData.extQuotationId &&leftRowData.status !=88 &&leftRowData.status !=70"
                    @click="handleForeign(leftRowData)">转对外</el-button>
-        <el-button type="danger" v-debounce v-if="leftRowData.status !=0 && leftRowData.status !=88"
+        <el-button type="danger" v-debounce v-if="leftRowData.status !=0 && leftRowData.status !=88 &&leftRowData.status !=70"
                    @click="handleRepeal(leftRowData,'/saleQuotation/cancellation')">作废</el-button>
       </template>
     </el-dialog>
@@ -708,7 +711,7 @@ const newPriceSheet = () => {
   modalType.value = "add";
   openAddDialog.value = true;
   formData.data = {
-    type: "1",
+    type: 1,
     quotationProductList: [],
   };
 };
@@ -1247,6 +1250,7 @@ const handleSubmit = (type) => {
             proxy.msgTip("操作成功", 1);
             openAddDialog.value = false;
             submitLoading.value = false;
+            detailDialog.value = false;
             getList();
           },
           (err) => {
@@ -1259,6 +1263,7 @@ const handleSubmit = (type) => {
             proxy.msgTip("操作成功", 1);
             openAddDialog.value = false;
             submitLoading.value = false;
+            detailDialog.value = false;
             getList();
           },
           (err) => {
@@ -1338,6 +1343,7 @@ const handleRepeal = (row, url) => {
         })
         .then((res) => {
           proxy.msgTip("操作成功", 1);
+          detailDialog.value = false;
           getList();
         });
     })
@@ -1401,6 +1407,7 @@ const handleForeign = (row) => {
   proxy.post("/saleQuotation/detail", { id: row.id }).then((res) => {
     formData.data = res;
     formData.data.saleQuotationId = res.id;
+    delete formData.data.code;
     delete formData.data.id;
     // 复制原本价格
     for (let i = 0; i < formData.data.quotationProductList.length; i++) {
@@ -1589,9 +1596,12 @@ const handleSubmitBack = () => {
           submitLoading.value = false;
           backDialog.value = false;
           getList();
+          detailDialog.value = false;
         });
       })
-      .catch((err) => {});
+      .catch((err) => {
+        submitLoading.value = false;
+      });
   });
 };
 </script>

src/views/EHSD/saleContract/priceSheetForeign/index.vue

@@ -231,9 +231,11 @@
       <PriceSheetDetailList :rowData="detailRowData" dataType="2" @changeLeftData="changeLeftData"></PriceSheetDetailList>
       <template #footer>
         <el-button @click="detailDialog = false" size="defualt" v-debounce>关 闭</el-button>
-        <el-button type="primary" v-debounce v-if="leftRowData.status !=88" @click="handleGenerate(leftRowData)">生成订单</el-button>
-        <el-button type="primary" v-debounce v-if="leftRowData.status !=88" @click="getDtl(leftRowData)">变更</el-button>
-        <el-button type="danger" v-debounce v-if="leftRowData.status !=0 && leftRowData.status !=88" @click="handleRepeal(leftRowData)">作废</el-button>
+        <el-button type="primary" v-debounce v-if="leftRowData.status !=88 &&leftRowData.status !=70"
+                   @click="handleGenerate(leftRowData)">生成订单</el-button>
+        <el-button type="primary" v-debounce v-if="leftRowData.status !=88 &&leftRowData.status !=70" @click="getDtl(leftRowData)">变更</el-button>
+        <el-button type="danger" v-debounce v-if="leftRowData.status !=0 && leftRowData.status !=88 &&leftRowData.status !=70"
+                   @click="handleRepeal(leftRowData)">作废</el-button>
       </template>
     </el-dialog>
 
@@ -568,6 +570,7 @@ const handleRepeal = (row) => {
         .then((res) => {
           proxy.msgTip("操作成功", 1);
           getList();
+          detailDialog.value = false;
         });
     })
     .catch((err) => {});
@@ -719,6 +722,7 @@ const handleSubmitOne = (type) => {
           proxy.msgTip("操作成功", 1);
           openAddDialog.value = false;
           submitLoading.value = false;
+          detailDialog.value = false;
           getList();
         },
         (err) => {