Merge branch 'blueBranch' into allTestUrgent

src/Form/projectChange/edit.vue

@@ -45,7 +45,7 @@
                   v-model="form.projectname"
                   :placeholder="$t('请输入项目名称')"
                   @blur="nameChange((param.content.pageNumber = 1))"
-                  :disabled="((siteid == 'HY' || siteid == 'YOSTEST1') && clueList.length > 0) || ((siteid == 'NB' || siteid == 'TZ') && data.reportstatus != '未报备')"
+                  :disabled="((siteid == 'HY' || siteid == 'YOSTEST1') && clueList.length > 0) || data.reportstatus != '未报备'"
                 ></el-input>
                 <span
                   style="color: red; font-size: 12px; margin-bottom: -10px"
@@ -158,7 +158,7 @@
                   :options="basicData.data().areaData"
                   @change="cascaderChange"
                   clearable
-                  :disabled="((siteid == 'HY' || siteid == 'YOSTEST1') && clueList.length > 0) || ((siteid == 'NB' || siteid == 'TZ') && data.reportstatus != '未报备')"
+                  :disabled="((siteid == 'HY' || siteid == 'YOSTEST1') && clueList.length > 0) || data.reportstatus != '未报备'"
                 >
                 </el-cascader>
               </el-form-item>
@@ -186,7 +186,7 @@
                 <el-input
                   v-model="form.address"
                   :placeholder="$t('请输入详细地址')"
-                  :disabled="(siteid == 'YOSTEST1' && clueList.length > 0) || ((siteid == 'NB' || siteid == 'TZ') && data.reportstatus != '未报备')"
+                  :disabled="(siteid == 'YOSTEST1' && clueList.length > 0) || data.reportstatus != '未报备'"
                 ></el-input>
               </el-form-item>
             </el-col>

src/views/salesData/components/salesTemplate.vue

@@ -60,7 +60,7 @@
       </div>
     </div>
     <div style="margin-top: 20px;margin-bottom: 10px">
-      <tableTemplate ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="356px">
+      <tableTemplate ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="442px">
         <template v-slot:customcol="scope">
           <p v-if="scope.column.columnname === 'amount'" >
             <span class="highlight-color" v-if="title === '订单'"> ¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>