发版更新内容bug修复

src/views/business/crm/company/form.vue

@@ -173,12 +173,11 @@
                       />
                     </el-form-item>
                   </el-col>
-                  <el-col :span="4">
-                    <el-form-item label="客户标签" prop="customerLabelId">
-                      <el-select v-model="form.customerLabelId" 
-                      style="width: 100%"
+                  <el-col :span="6" >
+                    <el-form-item label="客户标签" prop="customerLabelId" >
+                      <el-select v-model="form.customerLabelId"  style="width:100%"
                       v-if="editStatus"
-                      size="small">
+                      >
                       <el-option
                       v-for="item in options"
                       :key="item.id"
@@ -188,7 +187,6 @@
                     </el-select>
                     <span v-else>{{ selectedOptionLabel }}</span>
                     </el-form-item>
-                  
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="备注：">

src/views/business/crm/order/form.vue

@@ -139,6 +139,7 @@
                     placeholder="请输入客户名称"
                     popper-class="my-autocomplete"
                     clearable
+                    @clear="handleClearCompany"
                     @select="handleSelectCompany"
                     style="width: 100%"
                   >
@@ -236,23 +237,11 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="4">
+            <el-col :span="4">
               <el-form-item label="客户标签" prop="customerLabelId">
-                <el-select v-model="form.customerLabelId" 
-                style="width: 100%"
-                v-if="editStatus"
-                size="small">
-                <el-option
-                v-for="item in options"
-                :key="item.id"
-                :label="item.lable"
-                :value="item.id"
-              />
-              </el-select>
-              <span v-else>{{ selectedOptionLabel }}</span>
+                <span >{{ selectedOptionLabel }}</span>
               </el-form-item>
-            
-            </el-col> -->
+            </el-col>
             <el-col :span="14">
               <el-form-item label="备注" prop="remark">
                 <el-input
@@ -1375,17 +1364,17 @@ function open(id) {
     editStatus.value = true;
     title.value = "添加订单信息";
   }
-  // getOption()
+  getOption()
+}
+function getOption(){
+  listLableNoPage().then(res =>{
+     options.value = res.data
+  })
 }
-// function getOption(){
-//   listLableNoPage().then(res =>{
-//      options.value = res.data
-//   })
-// }
-// const selectedOptionLabel = computed(() => {
-//       const selectedOption = options.value.find(option => option.id === form.value.customerLabelId);
-//       return selectedOption ? selectedOption.lable : '';
-//     });
+const selectedOptionLabel = computed(() => {
+      const selectedOption = options.value.find(option => option.id === form.value.customerLabelId);
+      return selectedOption ? selectedOption.lable : '';
+    });
 
 function openSimple(id, optionType) {
   reset();
@@ -1826,8 +1815,11 @@ function handleSelectEmployee(item) {
 function handleSelectCompany(item) {
   form.value.companyName = item.name;
   form.value.companyId = item.id;
+  form.value.customerLabelId = item.customerLabelId
+}
+function handleClearCompany(){
+  form.value.customerLabelId = "";
 }
-
 function handleSelectProvince(item, index) {
   const _provinceCode = item.provinceCode;
   const _province = provincesArr.value[index].find((i) => {

src/views/business/financial/collection/form.vue

@@ -370,7 +370,7 @@
                     </template>
                   </el-table-column>
                   <el-table-column
-                    label="本次付款金额"
+                    label="本次收款金额"
                     prop="arriveAmount"
                     width="150"
                     header-align="center"
@@ -382,7 +382,7 @@
                           v-model="scope.row.arriveAmount"
                           size="small"
                           :min="0.0"
-                          placeholder="本次付款金额"
+                          placeholder="本次收款金额"
                           :precision="2"
                           :controls="false"
                           style="width: 100%"
@@ -402,7 +402,7 @@
                     </template>
                   </el-table-column>
                   <el-table-column
-                    label="已付款金额"
+                    label="已收款金额"
                     prop="arrived"
                     width="150"
                     align="right"

src/views/business/financial/collection/index.vue

@@ -53,6 +53,11 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="applierTime" label="申请时间：">
+        <el-date-picker v-model="queryParams.dateFilter" type="daterange" clearable format="YYYY - MM - DD "
+        value-format="YYYY-MM-DD" range-separator="至" start-placeholder="业务日期" end-placeholder="业务日期"
+        style="width: 100%;"></el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery"
           >搜索</el-button
@@ -104,6 +109,15 @@
           }}
         </template>
       </el-table-column>
+      <el-table-column label="审核时间" prop="verifyDate" width="80" align="center"> 
+        <template #default="scope">
+          {{
+            scope.row.verifyDate
+              ? moment(scope.row.verifyDate).format("YYYY-MM-DD")
+              : ""
+          }}
+        </template>
+        </el-table-column>
       <el-table-column
         v-if="getShowStatus(5)"
         label="收款时间"
@@ -231,7 +245,7 @@ const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const showRows = ref([2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13]);
+const showRows = ref([2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13,14]);
 const importExcelDialogRef = ref(null);
 const rows = ref([
   {
@@ -285,6 +299,7 @@ const queryParams = ref({
 
 /** 查询company列表 */
 function getList() {
+  console.log(1111,queryParams.value);
   loading.value = true;
   listCollection(queryParams.value).then((response) => {
     orderList.value = response.rows;

src/views/business/financial/contract/form.vue

@@ -441,16 +441,23 @@
   }
 
   /** 提交按钮 */
-  function submitForm() {
+  async  function submitForm() {
 
     // 应收款金额  和明细比较 如果大于应收内容 提示 当前的合同提过的收款申请总金额超过当前合同金额，不可提交，如有需要请跟财务人员联系
-    getCollectionDetail(form.value.contractId).then((res) => {
-     let amount = res.data + form.value.arriveAmount;
-      if (amount > form.value.contractAmount) {
-            proxy.$modal.msgError("当前的合同提过的收款申请总金额超过当前合同金额，不可提交，如有需要请跟财务人员联系");
-            return;
-      }
-      })
+
+    const res = await getCollectionDetail(form.value.contractId);
+    const amount = res.data + form.value.arriveAmount;
+    if (amount > form.value.contractAmount) {
+      proxy.$modal.msgError("当前的合同提过的收款申请总金额超过当前合同金额，不可提交，请联系财务人员。");
+      return;
+    }
+    // getCollectionDetail(form.value.contractId).then((res) => {
+    //  let amount = res.data + form.value.arriveAmount;
+    //   if (amount > form.value.contractAmount) {
+    //         proxy.$modal.msgError("当前的合同提过的收款申请总金额超过当前合同金额，不可提交，如有需要请跟财务人员联系");
+    //         return;
+    //   }
+    //   })
     if (form.value.arriveAmount > form.value.contractAmount) {
       proxy.$modal.msgError("实际收款金额不能大于合同收款金额");
       return;

src/views/business/production/archiveTicket/form.vue

@@ -215,7 +215,7 @@ function changeMonthHandle(item) {
 
 
 function handleBeforeUpload(file) {
-  // console.log(file);
+
   if (file.type !== "image/bmp" && file.type !== "image/gif" && file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/png' && file.type != 'image/tiff') {
     proxy.$modal.msgError("请选择图片文件");
     return false;