no message

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

@@ -70,7 +70,8 @@
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="applierName">
                 <template #default="scope">
-                    <el-link type="primary" @click="openDetail(scope.row)" style="font-size: 12px;">  {{scope.row.applierName}}</el-link>
+                    <el-link type="primary" @click="openDetail(scope.row)" style="font-size: 12px;">
+                        {{scope.row.applierName}}</el-link>
                 </template>
             </el-table-column>
             <el-table-column label="合同类型" align="center" prop="contractType">
@@ -81,14 +82,16 @@
             </el-table-column>
             <el-table-column label="实收" align="center" prop="reallyDetailAmount">
                 <template #default="scope">
-                    <el-link type="primary" @click="openDetailIn(scope.row)" style="font-size: 12px;"> {{scope.row.reallyDetailAmount}}</el-link>
+                    <el-link type="primary" @click="openDetailIn(scope.row)" style="font-size: 12px;">
+                        {{scope.row.reallyDetailAmount}}</el-link>
                 </template>
             </el-table-column>
             <el-table-column label="待收" align="center" prop="waitDetailAmount">
             </el-table-column>
             <el-table-column label="支出" align="center" prop="outAmount">
                 <template #default="scope">
-                    <el-link type="primary" @click="openDetailOut(scope.row)" style="font-size: 12px;"> {{scope.row.outAmount}}</el-link>
+                    <el-link type="primary" @click="openDetailOut(scope.row)" style="font-size: 12px;">
+                        {{scope.row.outAmount}}</el-link>
                 </template>
             </el-table-column>
             <el-table-column label="审核时间" align="center" prop="examineTime">
@@ -116,7 +119,11 @@
                     <el-table-column label="是否是项目" align="center" prop="isProject" />
                     <el-table-column label="服务金额" align="center" prop="detailAllAmount" />
                     <el-table-column label="实收" align="center" prop="reallyDetailAmount" />
-                    <el-table-column label="审核时间" align="center" prop="examineTime" />
+                    <el-table-column label="审核时间" align="center" prop="examineTime" >
+                        <template #default="scope">
+                            {{(scope.row.examineTime === '0000-00-00 00:00:00') ? '' : scope.row.examineTime}} 
+                          </template>
+                    </el-table-column>
                 </el-table>
             </div>
             <div v-if="outData.length > 0">
@@ -131,10 +138,15 @@
                     <el-table-column label="付款金额" align="center" prop="withdrawalAmount" />
                     <el-table-column label="申请人" width="100" align="center" prop="applierName" />
                     <el-table-column label="合同类型" align="center" prop="contractType" />
-                    <el-table-column label="是否是项目" align="center" prop="isProject" />
+                    <!-- <el-table-column label="是否是项目" align="center" prop="isProject" /> -->
                     <el-table-column label="服务金额" align="center" prop="detailAllAmount" />
                     <el-table-column label="实收" align="center" prop="reallyDetailAmount" />
-                    <el-table-column label="审核时间" align="center" prop="examineTime" />
+                    <!-- <el-table-column label="审核时间" align="center" prop="examineTime"/> -->
+                    <el-table-column label="审核时间" align="center" prop="examineTime">
+                        <template #default="scope">
+                          {{(scope.row.examineTime === '0000-00-00 00:00:00') ? '' : scope.row.examineTime}} 
+                        </template>
+                    </el-table-column>
                 </el-table>
             </div>
             <template #footer>
@@ -242,9 +254,12 @@
             if (res.code == 200) {
                 inData.value = res.data.data.inList
                 inData.value.forEach(element => {
-                    element.withdrawalAmount =   item.withdrawalAmount
+                    element.withdrawalAmount = item.withdrawalAmount
                 });
                 outData.value = res.data.data.outList
+                outData.value.forEach(element => {
+                    element.contractType = item.contractType
+                });
                 loading.value = false;
                 open.value = true;
             } else {
@@ -252,7 +267,7 @@
             }
         });
     }
-    
+
     function openDetailIn(item) {
         loading.value = true;
         let data = JSON.parse(JSON.stringify(queryParams.value));
@@ -262,7 +277,7 @@
             if (res.code == 200) {
                 inData.value = res.data.data.inList
                 inData.value.forEach(element => {
-                    element.withdrawalAmount =   item.withdrawalAmount
+                    element.withdrawalAmount = item.withdrawalAmount
                 });
                 outData.value = []
                 loading.value = false;

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

@@ -392,8 +392,26 @@
                             <div>{{ rowNum(item.amount) }}</div>
                           </el-form-item>
                         </el-col>
+                        <el-col :span="4" style="padding-top: 18px">
+                          <el-form-item label="所属区">
+                            <el-select
+                            v-if="editStatus"
+                            v-model="item.belongRegion"
+                            style="margin-right: 5px"
+                          >
+                            <el-option
+                              v-for="item in belong_region"
+                              :key="item.value"
+                              :label="item.label"
+                              :value="item.id"
+                            ></el-option>
+                          </el-select>
+                          <span v-else>{{item.regionName}}</span>
+                          </el-form-item>
+                        </el-col>
                       </el-row>
                     </el-col>
+              
                     <el-divider />
                   </el-row>
                 </el-tab-pane>
@@ -1006,6 +1024,20 @@
                           </div>
                         </div>
                       </el-col>
+                      <el-col
+                      v-if="item.taskTypeId == 9 || item.taskTypeId == 8"
+                        :span="3"
+                        style="
+                          padding-top: 18px;
+                          display: flex;
+                          flex-direction: column;
+                          margin-bottom: 18px;
+                        "
+                      >
+                      <el-form-item label="备注" prop="remark">
+                       <el-input v-model = "item.remark" />
+                      </el-form-item>
+                    </el-col>
                     </el-row>
                   </el-col>
                   <el-divider />
@@ -1256,6 +1288,7 @@ const props = defineProps({
 const { getList } = toRefs(props);
 /** 字典数组区 */
 const { virtual_address } = proxy.useDict("virtual_address");
+const { belong_region } = proxy.useDict("belong_region");
 
 /** 表单抽屉 页变量 */
 const title = ref("");
@@ -1349,6 +1382,7 @@ const { form, rules } = toRefs(data);
 /** 打开抽屉 */
 function open(id) {
   reset();
+  
   visible.value = true;
   if (id) {
     Promise.all([initTaskTypes(), listSource(), getOrder(id)]).then((res) => {