no message

src/views/business/collect/count/index.vue

@@ -5,29 +5,29 @@
             <el-button type="primary" size="small" icon="Download" @click="handleExport">导出</el-button>
         </div>
         <!-- 搜索区 -->
-        <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+        <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true"
             label-width="68px">
             <el-form-item label="客户名称:" prop="companyName">
-                <el-input v-model="queryParams.companyName" placeholder="请输入账户名称" style="width: 150px" clearable
+                <el-input v-model="queryParams.companyName"  size="small"  placeholder="请输入账户名称" style="width: 150px" clearable
                     @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="合同编号:" prop="contractNo">
-                <el-input v-model="queryParams.contractNo" placeholder="合同编号" style="width: 150px" clearable
+                <el-input v-model="queryParams.contractNo"  size="small" placeholder="合同编号" style="width: 150px" clearable
                     @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="产品:">
-                <el-select size="small" v-model="queryParams.taskTypeIds" placeholder="产品" clearable
+                <el-select size="small"  v-model="queryParams.taskTypeIds"   placeholder="产品" clearable
                     style="width: 150px" multiple>
                     <el-option v-for="item in taskType " :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
             </el-form-item>
             <el-form-item prop="receiptDateFilter" label="到账时间：">
-                <el-date-picker v-model="queryParams.receiptDateFilter" type="daterange" clearable
+                <el-date-picker v-model="queryParams.receiptDateFilter" type="daterange" clearable  size="small"
                     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 prop="examineTimeFilter" label="审核时间：">
-                <el-date-picker v-model="queryParams.examineTimeFilter" type="daterange" clearable
+                <el-date-picker v-model="queryParams.examineTimeFilter"   size="small" 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>
@@ -47,8 +47,8 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item style="margin-left: 40px;">
-                    <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                    <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                    <el-button type="primary" icon="Search" @click="handleQuery"  size="small">搜索</el-button>
+                    <el-button icon="Refresh" @click="resetQuery"  size="small">重置</el-button>
                 </el-form-item>
             </div>
 
@@ -201,11 +201,11 @@
     const projectTypes = ref([
         {
             label: "是",
-            value: 1,
+            value: 0,
         },
         {
             label: "否",
-            value: 2,
+            value: 1,
         },
 
     ]);
@@ -234,6 +234,7 @@
     /** 重置按钮操作 */
     function resetQuery() {
         proxy.resetForm("queryRef");
+        queryParams.value.taskTypeIds = [];
         handleQuery();
     }
 

src/views/business/crm/dict/index.vue

@@ -10,7 +10,7 @@
         v-hasPermi="['business:crm:dict:remove']">删除</el-button>
     </div>
 
-    <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"
+    <el-form class="list-search-container"  :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"
       label-width="68px">
       <el-form-item label="字典名称：" prop="dictName" style="width: 220px">
         <el-input size="small" v-model="queryParams.dictName" placeholder="请输入字典名称" clearable

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

@@ -8,7 +8,7 @@
             ><el-icon>
               <Document />
             </el-icon>
-            合同信息222</span
+            合同信息</span
           >
 
           <el-button
@@ -248,7 +248,7 @@
                   v-if="editStatus"
                   v-model="form.boss"
                   style="width: 100%; margin: 0; padding: 0"
-                  placeholder="请输入备注"
+                  placeholder="请输入甲方"
                 />
                 <span v-else>{{ form.boss }}</span>
               </el-form-item>
@@ -391,6 +391,9 @@
                           <el-form-item label="合计金额">
                             <div>{{ rowNum(item.amount) }}</div>
                           </el-form-item>
+                        </el-col>
+                        <el-col :span="4" style="padding-top: 18px" v-if="item.taskTypeId ==4">
+                       
                         </el-col>
                         <el-col :span="4" style="padding-top: 18px" v-if="item.taskTypeId ==4">
                           <el-form-item label="所属区">
@@ -1023,10 +1026,13 @@
                             {{ rowNum(item.amount) }}
                           </div>
                         </div>
+                      </el-col>
+                      <el-col :span="4" style="padding-top: 18px">
+                  
                       </el-col>
                       <el-col
                       v-if="item.taskTypeId == 9 || item.taskTypeId == 8"
-                        :span="3"
+                        :span="9"
                         style="
                           padding-top: 18px;
                           display: flex;

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

@@ -36,21 +36,25 @@
       <!--<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
     </div>
     <!-- 搜索区 -->
-    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
+    <el-form class="list-search-container"  :model="queryParams" ref="queryRef" :inline="true"
       label-width="68px">
       <el-form-item label="客户名称：" prop="companyName">
-        <el-input v-model="queryParams.companyName" placeholder="请输入客户名称" clearable style="width: 200px"
+        <el-input v-model="queryParams.companyName" size="small" placeholder="请输入客户名称" clearable style="width: 200px"
           @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="合同编号" prop="contractNo">
-        <el-input v-model="queryParams.contractNo" placeholder="请输入客户名称" clearable style="width: 200px"
+      <el-form-item label="合同编号：" prop="contractNo">
+        <el-input v-model="queryParams.contractNo" size="small" placeholder="请输入客户名称" clearable style="width: 200px"
           @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="客户标签" >
-        <el-select v-model="queryParams.customerLabelId" style="width:100%" multiple   >
+      <el-form-item label="客户标签：" >
+        <el-select v-model="queryParams.customerLabelId" size="small" style="width:100%" multiple   >
           <el-option v-for="item in options" :key="item.id" :label="item.lable" :value="item.id" />
         </el-select>
       </el-form-item>
+      <el-form-item label="甲方：" >
+          <el-input v-model="queryParams.boss" size="small" placeholder="请输入客户名称" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
       <el-form-item label="合同类型：" prop="contractType">
         <el-select size="small" v-model="queryParams.contractType" placeholder="服务类型" clearable style="width: 100px">
           <el-option v-for="item in contractTypes" :key="item.value" :label="item.label" :value="item.value" />
@@ -62,9 +66,9 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="operation" @click="moreSearch = true">更多</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="Search" @click="handleQuery" size="small">搜索</el-button>
+        <el-button icon="operation" @click="moreSearch = true" size="small">更多</el-button>
+        <el-button icon="Refresh" @click="resetQuery" size="small">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -87,9 +91,9 @@
       </el-table-column>
       <el-table-column label="签单人" align="center" prop="signerName" min-width="120" />
       <el-table-column label="合同来源" align="center" prop="sourceCategoryName" min-width="120" />
-      <el-table-column label="客户标签" align="center" prop="customerLabelName" min-width="120" >
+      <el-table-column label="客户标签" align="center" prop="customerLabelName" min-width="120" />
    
-      </el-table-column>
+      <el-table-column label="甲方" align="center" prop="boss" min-width="120" />
       <el-table-column label="审核状态" align="center" prop="verifyStatus" width="110">
         <template #default="scope">
           <dict-tag :options="contract_verify_status" :value="scope.row.verifyStatus" />
@@ -124,7 +128,7 @@
     <!-- 分页 -->
     <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize" @pagination="getList" />
-    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" append-to-body size="small" draggable
+    <el-dialog title="更多搜索" v-model="moreSearch" width="720px" append-to-body size="small" draggable
       :close-on-click-modal="false">
       <el-form :model="queryParams" ref="queryRef" size="small" label-width="100">
         <el-row :gutter="20">
@@ -371,6 +375,8 @@
   /** 重置按钮操作 */
   function resetQuery() {
     proxy.resetForm("queryRef");
+    queryParams.value.customerLabelId = [];
+    queryParams.value.formDate= [];
     handleQuery();
   }
 

src/views/business/production/IndividualIncomeTaxIs/index.vue

@@ -56,13 +56,19 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="客户名称" align="center" prop="companyName" min-width="250">
         <template #default="scope">
-          <div style="display: flex; align-items: center; justify-content: center;">
-          <el-tooltip :content="scope.row.customerLabelName" placement="top">
-            <el-icon :size="15" >
-              <CollectionTag />
-            </el-icon>
-          </el-tooltip>
-            <span style="margin-left: 15px;">{{scope.row.companyName}}</span>
+          <div style="display: flex; align-items: center; ">
+            <template v-if="scope.row.customerLabelName ">
+              <el-tooltip :content="scope.row.customerLabelName" placement="top">
+                <el-icon :size="15">
+                  <CollectionTag />
+                </el-icon>
+              </el-tooltip>
+              <span style="padding-left:5px;">{{ scope.row.companyName }}</span>
+            </template>
+            <template v-else>
+              <div style="width: 20px; height: 15px;"></div>
+              <span>{{ scope.row.companyName }}</span>
+            </template>
           </div>
         </template>
       </el-table-column>

src/views/business/production/IndividualIncomeTaxIsZero/index.vue

@@ -56,13 +56,19 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="客户名称" align="center" prop="companyName" min-width="250">
           <template #default="scope">
-            <div style="display: flex; align-items: center; justify-content: center;">
-            <el-tooltip :content="scope.row.customerLabelName" placement="top">
-              <el-icon :size="15" >
-                <CollectionTag />
-              </el-icon>
-            </el-tooltip>
-              <span style="margin-left: 15px;">{{scope.row.companyName}}</span>
+            <div style="display: flex; align-items: center; ">
+              <template v-if="scope.row.customerLabelName ">
+                <el-tooltip :content="scope.row.customerLabelName" placement="top">
+                  <el-icon :size="15">
+                    <CollectionTag />
+                  </el-icon>
+                </el-tooltip>
+                <span style="padding-left:5px;">{{ scope.row.companyName }}</span>
+              </template>
+              <template v-else>
+                <div style="width: 20px; height: 15px;"></div>
+                <span>{{ scope.row.companyName }}</span>
+              </template>
             </div>
           </template>
         </el-table-column>

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

@@ -53,13 +53,19 @@
       @selection-change="handleSelectionChange">
       <el-table-column label="客户名称" align="center" prop="companyName" min-width="250">
         <template #default="scope">
-          <div style="display: flex; align-items: center; justify-content: center;">
-          <el-tooltip :content="scope.row.customerLabelName" placement="top">
-            <el-icon :size="15" >
-              <CollectionTag />
-            </el-icon>
-          </el-tooltip>
-            <span style="margin-left: 15px;">{{scope.row.companyName}}</span>
+          <div style="display: flex; align-items: center; ">
+            <template v-if="scope.row.customerLabelName ">
+              <el-tooltip :content="scope.row.customerLabelName" placement="top">
+                <el-icon :size="15">
+                  <CollectionTag />
+                </el-icon>
+              </el-tooltip>
+              <span style="padding-left:5px;">{{ scope.row.companyName }}</span>
+            </template>
+            <template v-else>
+              <div style="width: 20px; height: 15px;"></div>
+              <span>{{ scope.row.companyName }}</span>
+            </template>
           </div>
         </template>
       </el-table-column>

src/views/business/production/financialReportTax/index.vue

@@ -55,13 +55,19 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="客户名称" align="center" prop="companyName" min-width="250">
         <template #default="scope">
-          <div style="display: flex; align-items: center; justify-content: center;">
-          <el-tooltip :content="scope.row.customerLabelName" placement="top">
-            <el-icon :size="15" >
-              <CollectionTag />
-            </el-icon>
-          </el-tooltip>
-            <span style="margin-left: 15px;">{{scope.row.companyName}}</span>
+          <div style="display: flex; align-items: center; ">
+            <template v-if="scope.row.customerLabelName ">
+              <el-tooltip :content="scope.row.customerLabelName" placement="top">
+                <el-icon :size="15">
+                  <CollectionTag />
+                </el-icon>
+              </el-tooltip>
+              <span style="padding-left:5px;">{{ scope.row.companyName }}</span>
+            </template>
+            <template v-else>
+              <div style="width: 20px; height: 15px;"></div>
+              <span>{{ scope.row.companyName }}</span>
+            </template>
           </div>
         </template>
       </el-table-column>

src/views/business/production/financialReportTaxIsZero/index.vue

@@ -98,13 +98,19 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="客户名称" align="center" prop="companyName" min-width="250">
         <template #default="scope">
-          <div style="display: flex; align-items: center; justify-content: center;">
-          <el-tooltip :content="scope.row.customerLabelName" placement="top">
-            <el-icon :size="15" >
-              <CollectionTag />
-            </el-icon>
-          </el-tooltip>
-            <span style="margin-left: 15px;">{{scope.row.companyName}}</span>
+          <div style="display: flex; align-items: center; ">
+            <template v-if="scope.row.customerLabelName ">
+              <el-tooltip :content="scope.row.customerLabelName" placement="top">
+                <el-icon :size="15">
+                  <CollectionTag />
+                </el-icon>
+              </el-tooltip>
+              <span style="padding-left:5px;">{{ scope.row.companyName }}</span>
+            </template>
+            <template v-else>
+              <div style="width: 20px; height: 15px;"></div>
+              <span>{{ scope.row.companyName }}</span>
+            </template>
           </div>
         </template>
       </el-table-column>

src/views/business/production/keepAccount/index.vue

@@ -60,13 +60,19 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="客户名称" align="center" prop="companyName" min-width="250">
         <template #default="scope">
-          <div style="display: flex; align-items: center; justify-content: center;">
-          <el-tooltip :content="scope.row.customerLabelName" placement="top">
-            <el-icon :size="15" >
-              <CollectionTag />
-            </el-icon>
-          </el-tooltip>
-            <span style="margin-left: 15px;">{{scope.row.companyName}}</span>
+          <div style="display: flex; align-items: center; ">
+            <template v-if="scope.row.customerLabelName ">
+              <el-tooltip :content="scope.row.customerLabelName" placement="top">
+                <el-icon :size="15">
+                  <CollectionTag />
+                </el-icon>
+              </el-tooltip>
+              <span style="padding-left:5px;">{{ scope.row.companyName }}</span>
+            </template>
+            <template v-else>
+              <div style="width: 20px; height: 15px;"></div>
+              <span>{{ scope.row.companyName }}</span>
+            </template>
           </div>
         </template>
       </el-table-column>

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

@@ -509,16 +509,16 @@ function handleSave() {
       if (saveValue.id == null) {
         saveDetail(saveValue).then((res) => {
           proxy.$modal.msgSuccess("保存成功");
-          reset();
-          close();
-          getList.value();
+          // reset();
+          // close();
+          // getList.value();
         });
       } else {
         updateDetail(saveValue).then((res) => {
           proxy.$modal.msgSuccess("保存成功");
-          reset();
-          close();
-          getList.value();
+          // reset();
+          // close();
+          // getList.value();
         });
       }
     })

src/views/business/production/receiveTicket/index.vue

@@ -61,13 +61,19 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="客户名称" align="center" prop="companyName" min-width="250">
         <template #default="scope">
-          <div style="display: flex; align-items: center; justify-content: center;">
-          <el-tooltip :content="scope.row.customerLabelName" placement="top">
-            <el-icon :size="15" >
-              <CollectionTag />
-            </el-icon>
-          </el-tooltip>
-            <span style="margin-left: 15px;">{{scope.row.companyName}}</span>
+          <div style="display: flex; align-items: center; ">
+            <template v-if="scope.row.customerLabelName ">
+              <el-tooltip :content="scope.row.customerLabelName" placement="top">
+                <el-icon :size="15">
+                  <CollectionTag />
+                </el-icon>
+              </el-tooltip>
+              <span style="padding-left:5px;">{{ scope.row.companyName }}</span>
+            </template>
+            <template v-else>
+              <div style="width: 20px; height: 15px;"></div>
+              <span>{{ scope.row.companyName }}</span>
+            </template>
           </div>
         </template>
       </el-table-column>

src/views/business/production/salary/index.vue

@@ -64,13 +64,19 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="客户名称" align="center" prop="companyName" min-width="250">
         <template #default="scope">
-          <div style="display: flex; align-items: center;justify-content: center;">
-          <el-tooltip :content="scope.row.customerLabelName" placement="top">
-            <el-icon :size="15" >
-              <CollectionTag />
-            </el-icon>
-          </el-tooltip>
-            <span style="margin-left: 15px;">{{scope.row.companyName}}</span>
+          <div style="display: flex; align-items: center; ">
+            <template v-if="scope.row.customerLabelName ">
+              <el-tooltip :content="scope.row.customerLabelName" placement="top">
+                <el-icon :size="15">
+                  <CollectionTag />
+                </el-icon>
+              </el-tooltip>
+              <span style="padding-left:5px;">{{ scope.row.companyName }}</span>
+            </template>
+            <template v-else>
+              <div style="width: 20px; height: 15px;"></div>
+              <span>{{ scope.row.companyName }}</span>
+            </template>
           </div>
         </template>
       </el-table-column>

src/views/business/production/salaryZero/index.vue

@@ -65,13 +65,19 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="客户名称" align="center" prop="companyName" min-width="250">
         <template #default="scope">
-          <div style="display: flex; align-items: center; justify-content: center;">
-          <el-tooltip :content="scope.row.customerLabelName" placement="top">
-            <el-icon :size="15" >
-              <CollectionTag />
-            </el-icon>
-          </el-tooltip>
-            <span style="margin-left: 15px;">{{scope.row.companyName}}</span>
+          <div style="display: flex; align-items: center; ">
+            <template v-if="scope.row.customerLabelName ">
+              <el-tooltip :content="scope.row.customerLabelName" placement="top">
+                <el-icon :size="15">
+                  <CollectionTag />
+                </el-icon>
+              </el-tooltip>
+              <span style="padding-left:5px;">{{ scope.row.companyName }}</span>
+            </template>
+            <template v-else>
+              <div style="width: 20px; height: 15px;"></div>
+              <span>{{ scope.row.companyName }}</span>
+            </template>
           </div>
         </template>
       </el-table-column>