Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/option/supervise/supervise.js

@@ -296,6 +296,17 @@ export const IndicatorColumnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'remark',
+    label: '备注',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   // {
   //   prop: 'assessUserName',
   //   label: '考核人',

src/views/aftersales/aftersalesWorkOrderInfo.vue

@@ -456,21 +456,8 @@
                     />
                   </el-select>
                 </div>
-
+              <!-- 责任人  -->
-                <div class="sk_input">
+              <div class="sk_input" v-if="item.state == 0">
-                  <span>原因</span>
-                  <el-tooltip :content="item.reason" placement="top">
-                    <el-input v-model="item.reason" placeholder="暂无原因" disabled />
-                  </el-tooltip>
-                </div>
-                <div class="sk_input">
-                  <span>金额</span>
-                  <el-tooltip :content="item.num ? item.num : '0'" placement="top">
-                    <el-input v-model="item.num" disabled />
-                  </el-tooltip>
-                </div>
-                <!-- 责任人  -->
-                <div class="sk_input" v-if="item.state == 0">
                   <span>责任人</span>
                   <el-tooltip
                     :content="
@@ -487,6 +474,19 @@
                     />
                   </el-tooltip>
                 </div>
+                <div class="sk_input">
+                  <span>原因</span>
+                  <el-tooltip :content="item.reason" placement="top">
+                    <el-input v-model="item.reason" placeholder="暂无原因" disabled />
+                  </el-tooltip>
+                </div>
+                <div class="sk_input">
+                  <span>金额</span>
+                  <el-tooltip :content="item.num ? item.num : '0'" placement="top">
+                    <el-input v-model="item.num" disabled />
+                  </el-tooltip>
+                </div>
+  
 
                 <div class="sk_input" v-if="item.state == 1"></div>
               </div>

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -413,6 +413,7 @@
                           placeholder="请输入处理结果说明"
                           clearable
                           :autosize="{ minRows: 3, maxRows: 4 }"
+                           :disabled="$route.query.RouterState == 'end'"
                           type="textarea"
                         />
                       </el-form-item>
@@ -441,7 +442,7 @@
 
                 <div class="payanindemnity" v-for="(item, index) in CompensationParty" :key="index">
                   <div style="display: flex">
-                    <el-form-item :label="item.state == 0 ? '赔款方' : '受款方'" 
+                    <el-form-item  :class="{'payanindemnity_title':item.state ==0 }"  :label="item.state == 0 ? '赔款方' : '受款方'" 
                     >
                       <el-select v-model="item.warehouseId" filterable placeholder="请选择仓库">
                         <el-option
@@ -453,7 +454,16 @@
                       </el-select>
                     </el-form-item>
 
-                    <el-form-item label="原因"
+                    <el-form-item label="责任人" v-if="item.state == 0"
+                    >
+                      <el-input
+                        v-model="item.compensationPersonnel"
+                        placeholder="请填写责任人"
+                        :rows="2"
+                      />
+                    </el-form-item>
+
+                    <el-form-item label="原  .  因"
                     >
                       <el-input v-model="item.reason" placeholder="请填写原因" />
                     </el-form-item>
@@ -470,15 +480,7 @@
                       />
                     </el-form-item>
 
-                    <el-form-item label="责任人" v-if="item.state == 0"
+
-                    >
-                      <el-input
-                        v-model="item.compensationPersonnel"
-                        placeholder="请填写责任人"
-                        clearable
-                        :rows="2"
-                      />
-                    </el-form-item>
                   </div>
                   <div style="display: flex">
                     <div class="el_cwBtn">
@@ -917,8 +919,6 @@ const groundlineType = ref(''); //责任方状态
 const routerState = ref(''); //路由状态
 const TotalamountCompensation = ref(0); //赔款金额合计
 const fileDom=ref(null);//文件上传节点
-const TotalClaimAmount = ref(0); //理赔总金额
-const TotalamountReceived = ref(0); //收款金额合计
 const personResponsibleList = ref([]); //责任人列表
 const msgHight = ref(100); //聊天框消息高度
 const msgTop = ref(10); //聊天框吸顶距离
@@ -947,6 +947,8 @@ const Mydata = ref(); //当前登录人信息
 const DiscoveringNodes = ref([]); //发现节点
 const IndexException = ref([]); //异常类型
 const Pageloading = ref(false); //页面加载load
+const TotalClaimAmount = ref(0); //理赔总金额
+const TotalamountReceived=ref(0);//收款金额合计
 const userInfo = ref({}); //用户信息
 const PackageInfo = ref([
   //包件信息
@@ -979,6 +981,9 @@ const videoUrl = ref(null); //视频预览
 const VideoPreviewStatus = ref(false); //视频预览状态
 const Paymentmethodoptions = ref([]); //支付方式下拉菜单
 const warehouseData = ref([]); //处理方
+const getClass=computed((item)=>{
+  return item.state === 0 ? 'class-for-state-0' : 'class-for-other-state';
+})
 const MessageContent = ref([]);
 const CompensationParty = ref([
   {
@@ -1354,6 +1359,7 @@ const onLoad = async () => {
                 accounting: item.accounting ? item.accounting : '',
                 warehouseId: item.warehouseId, //仓库
                 compensationPersonnel: item.compensationPersonnel, //赔款人员
+                button:!index?false:true,
               });
             });
           }
@@ -1370,6 +1376,7 @@ const onLoad = async () => {
                 warehouseId: item.warehouseId, //仓库
                 cld: index + 1,
                 id: item.id,
+                button:true
               });
             });
           }
@@ -1718,8 +1725,7 @@ const AddCompensation = () => {
   );
 };
 // 添加受款方
-const AddPayee=()=>{
+const AddPayee = () => {
-  console.log(warehouseData.value,'warehouseData');
   let data = {
     state: 1, //赔款方
     warehouseId: '', //仓库
@@ -1728,12 +1734,15 @@ const AddPayee=()=>{
     compensationPersonnel: '', //责任人
     button: true, //按钮可移除
   };
-  CompensationParty.value.splice(
+
-    CompensationParty.value.map(item => item.state).lastIndexOf(1) + 1,
+  // 找到最后一个状态为假的条目索引
-    0,
+  let lastIndex = CompensationParty.value.reduce((acc, item, index) => {
-    data
+    return item.state === 0 ? index : acc;
-  );
+  }, -1);
-}
+
+  // 在最后一个状态为假的条目后面插入新的数据条目
+  CompensationParty.value.splice(lastIndex + 1, 0, data);
+};
 // 添加赔款方
 // const AddCompensation = () => {
 //   console.log('添加赔款方');
@@ -1810,45 +1819,24 @@ const Totalamount = () => {
     .reduce((accumulator, currentValue) => accumulator + currentValue, 0);
 };
 // 移除按钮
-const payremove =async (item, index) => {
+const payremove = (item, index) => {
   console.log(item, 'item');
   console.log(index, 'index');
   const cleanedItem = item.state ? '受款方' : '赔款方';
   // 尝试使用 HTML 字符串
   const message = `是否移除当前<span style="color: red; font-weight: bold">${cleanedItem}</span>?`;
- await ElMessageBox.confirm(message, '提示', {
+  ElMessageBox.confirm(message, '提示', {
     dangerouslyUseHTMLString: true, // 如果组件支持，启用此选项以解析 HTML
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',
   })
     .then(() => {
-   
-      if (item.state) {
-        Totalamountreceived.value -= item.num; //受款总金额
-      } else {
-        Totalamountcompensation.value -= item.num; //赔款总金额
-      }
       CompensationParty.value.splice(index, 1);
+      amountMoney()
+  
     })
     .catch(() => {});
-  
-  return
-  // 判断赔付方，至少保留一条数据
-
-  if (CompensationParty.value.map(res => res.state == 0).length == 1) {
-    ElMessage({
-      message: '赔款必填最少一条',
-      type: 'warning',
-    });
-    return;
-  }
-  CompensationParty.value.splice(val, 1);
-  for (let i = val; i < CompensationParty.value.length; i++) {
-    CompensationParty.value[i].cld = CompensationParty.value[i - 1].cld + 1; // 更新后续对象的id值
-  }
-  console.log('CompensationParty :>> ', CompensationParty);
-  amountMoney();
 };
 // 公司占比计算
 const ProportionInput = val => {
@@ -3516,4 +3504,9 @@ const CustomerServiceCompleted = () => {
   left: 12%;
   top: 10%;
 }
+:deep(.payanindemnity_title){
+  .el-form-item__label{
+    color: #f00;
+  }
+}
 </style>

src/views/aftersales/aftersalesWorkOrdermodify.vue

@@ -697,6 +697,15 @@
                       />
                     </el-select>
                   </el-form-item>
+
+                  <el-form-item label="责任人" v-if="!item.state">
+                    <el-input
+                      v-model="item.compensationPersonnel"
+                      placeholder="请填写责任人"
+                      clearable
+                    />
+                  </el-form-item>
+
                   <el-form-item label="原因" class="reason">
                     <el-input v-model="item.reason" placeholder="请填写原因" clearable />
                   </el-form-item>
@@ -712,13 +721,7 @@
                     />
                   </el-form-item>
 
-                  <el-form-item label="责任人" v-if="!item.state">
+
-                    <el-input
-                      v-model="item.compensationPersonnel"
-                      placeholder="请填写责任人"
-                      clearable
-                    />
-                  </el-form-item>
                 </div>
 
                 <div class="el_left_btn">

src/views/supervise/IndicatorList.vue

@@ -214,6 +214,16 @@
             placeholder="暂无"
           />
         </el-form-item>
+
+        <el-form-item label="备注">
+          <el-input
+            :rows="2"
+            type="textarea"
+            v-model="lassificationform.remark"
+            placeholder="暂无"
+          />
+        </el-form-item>
+
         <div class="el_photo_max">
           <el-form-item label="照片" class="el_fotnr">
             <el-upload

src/views/system/tenant.vue

@@ -231,6 +231,25 @@ export default {
             addDisplay: false,
             editDisplay: false,
           },
+          {
+            label: '租户类型',
+            prop: 'tenantType',
+            span: 24,
+            type: 'select',
+            rules: [
+              { required: true, message: '请选择租户类型', trigger: 'blur' }
+            ],
+            dicData: [
+              {
+                label: '干仓配',
+                value: 1,
+              },
+              {
+                label: '商场',
+                value: 2,
+              },
+            ],
+          },
           {
             label: '绑定域名',
             prop: 'domainUrl',