Merge branch 'dev' into test

src/views/contractManage/contractBook/components/addDialog.vue

@@ -360,6 +360,7 @@
               style="width: 100%"
               v-model="form.settlementDate"
               type="daterange"
+              :clearable="false"
               value-format="yyyy-MM-dd"
               range-separator="至"
               start-placeholder="开始日期"
@@ -378,6 +379,7 @@
             </el-date-picker> -->
             <el-date-picker
               v-model="form.settlementDate"
+              :clearable="false"
               type="monthrange"
               range-separator="至"
               start-placeholder="开始月份"

src/views/financialManage/receivableManage/components/infoTable.vue

@@ -103,6 +103,7 @@
               :controls="false"
               :precision="2"
               :min="0.0"
+              style="width: 95%"
             ></el-input-number>
           </el-form-item>
         </template>
@@ -349,7 +350,7 @@
             0
           );
           this.unreceiveTotalPrice =
-            this.form.receivableTotalPrice - this.receivedTotalPrice;
+            Number((this.form.receivableTotalPrice - this.receivedTotalPrice).toFixed(2));
         });
       },
       handleDelInfo(index) {

src/views/purchasingManage/purchaseOrder/accountstatement/index.vue

@@ -91,6 +91,11 @@
             <el-popconfirm
               class="ele-action"
               title="确定要删除此信息吗？"
+              v-if="
+                  (isNeed_process_is_close &&
+                    [0, 3].includes(row.reviewStatus)) ||
+                  !isNeed_process_is_close
+                "
               @confirm="remove([row.id])"
             >
               <template v-slot:reference>
@@ -98,11 +103,6 @@
                   type="danger"
                   :underline="false"
                   icon="el-icon-delete"
-                  v-if="
-                    (isNeed_process_is_close &&
-                      [0, 3].includes(row.reviewStatus)) ||
-                    !isNeed_process_is_close
-                  "
                 >
                   删除
                 </el-link>

src/views/purchasingManage/purchaseOrder/components/addDialogNew.vue

@@ -300,6 +300,7 @@
             <el-date-picker
               style="width: 100%"
               v-model="form.settlementDate"
+              :clearable="false"
               type="daterange"
               value-format="yyyy-MM-dd"
               range-separator="至"
@@ -320,6 +321,7 @@
             <el-date-picker
               v-model="form.settlementDate"
               type="monthrange"
+              :clearable="false"
               range-separator="至"
               start-placeholder="开始月份"
               end-placeholder="结束月份"

src/views/saleManage/saleOrder/components/addDialogNew.vue

@@ -326,6 +326,7 @@
               style="width: 100%"
               v-model="form.settlementDate"
               type="daterange"
+              :clearable="false"
               value-format="yyyy-MM-dd"
               range-separator="至"
               start-placeholder="开始日期"
@@ -344,6 +345,7 @@
             </el-date-picker> -->
             <el-date-picker
               v-model="form.settlementDate"
+              :clearable="false"
               type="monthrange"
               range-separator="至"
               start-placeholder="开始月份"