Ver código fonte

部分bug修改

cz 1 ano atrás
pai
commit
e07a488765

+ 1 - 0
src/components/process/SF/ContractChange.vue

@@ -1484,6 +1484,7 @@ const getAllData = (businessId) => {
     res.provinceId = res.buyProvinceId;
     res.cityId = res.buyCityId;
     if (res.grossProfitInfoList && res.grossProfitInfoList.length > 0) {
+      console.log(res.grossProfitInfoList, "adas");
       $bus.emit("getGrossData", res.grossProfitInfoList);
     }
     for (const key in res) {

+ 13 - 13
src/views/MES/productionOrder/index.vue

@@ -583,19 +583,19 @@ const clickDistributeProduction = (row) => {
     produceTime: moment().format("yyyy-MM-DD HH:mm:ss"),
   };
 
-  // productionDialog.value = true;
-  proxy
-    .msgConfirm()
-    .then((res) => {
-      proxy.post("/produceOrder/putProduction", formData.data).then((res) => {
-        proxy.msgTip("操作成功");
-        formLoading.value = false;
-        productionDialog.value = false;
-        getList();
-        getRightData();
-      });
-    })
-    .catch((err) => {});
+  productionDialog.value = true;
+  // proxy
+  //   .msgConfirm()
+  //   .then((res) => {
+  //     proxy.post("/produceOrder/putProduction", formData.data).then((res) => {
+  //       proxy.msgTip("操作成功");
+  //       formLoading.value = false;
+  //       productionDialog.value = false;
+  //       getList();
+  //       getRightData();
+  //     });
+  //   })
+  //   .catch((err) => {});
 };
 const submitProduction = () => {
   productionFormDom.value.handleSubmit(() => {

+ 2 - 2
src/views/MES/productionScheduling/index.vue

@@ -7,7 +7,7 @@
         ]" @get-list="getList">
 
         <template #product="{ item }">
-          <div style="width:100%; ">
+          <div style="width:100%;padding:0 6px">
             <el-popover placement="bottom-start" title="" :width="300" trigger="hover">
               <div default>
                 {{item.productName}}
@@ -147,7 +147,7 @@ const allDay = ref([]);
 const changDay = (val) => {
   getList();
   allDay.value = [];
-  config.value.splice(4, config.value.length - 4);
+  config.value.splice(5, config.value.length - 5);
   let days = getDateAllDay(val);
   let list = [];
   for (let i = 0; i < days.length; i++) {

+ 1 - 7
src/views/process/processApproval/index.vue

@@ -553,13 +553,7 @@ const optionTwo = reactive({
 });
 const showChart = ref(false);
 onMounted(async () => {
-  if (
-    (userInfo.roles.includes("ceo") ||
-      userInfo.roles.includes("salesDirector") ||
-      userInfo.roles.includes("financeOfficer") ||
-      userInfo.roles.includes("approve_ accountant")) &&
-    (route.query.processType == 10 || route.query.processType == 30)
-  ) {
+  if (route.query.processType == 10 || route.query.processType == 30) {
     showChart.value = true;
   }
   // 路由进入