部分页面bug解决

src/components/common-list.vue

@@ -18,7 +18,8 @@
               </slot>
             </span>
             <span v-else style="flex: 1;" :style="j.style?j.style:{}">
-              {{ i[j.prop] || ''}}
+              <span v-if="i[j.prop]!= undefined">{{ i[j.prop] }}</span>
+              <span v-else></span>
             </span>
           </div>
         </div>

src/components/testForm/index.vue

@@ -132,47 +132,56 @@
         </div>
       </van-cell-group>
       <!-- 循环业务数据 -->
-      <van-cell-group inset v-for="(item, index) in formData[btnConfigCopy.prop]" :key="index">
-        <div class="row">
-          <div>{{ btnConfigCopy.listTitle || "明细" }}{{ index + 1 }}</div>
-          <van-button plain type="primary" @click="handleRemove(index, btnConfigCopy)" size="mini" style="border: none; background: #ecebeb"
-                      :disabled="formOption.readonly" v-if="formOption.btnConfig !== undefined && formOption.btnConfig.isNeed">删除</van-button>
-        </div>
-        <!-- 循环表单数据 -->
-        <div v-for="(i, sonIndex) in btnConfigCopy.listConfig" :key="i.prop">
-          <van-field v-if="i.type == 'input'" v-model="formData[btnConfigCopy.prop][index][i.prop]" :label="i.label" :name="i.prop"
-                     :type="i.itemType ? i.itemType : 'text'" :placeholder="i.placeholder ? i.placeholder : '请输入'"
-                     :clearable="i.clearable ? i.clearable : false" :readonly="getFieldReadonly(i)" :rules="getRules(i)" :required="getRequired(i)"
-                     @change="
+      <template v-if="formData[btnConfigCopy.prop] && formData[btnConfigCopy.prop].length>0">
+        <van-cell-group inset v-for="(item, index) in formData[btnConfigCopy.prop]" :key="index">
+          <div class="row">
+            <div>{{ btnConfigCopy.listTitle || "明细" }}{{ index + 1 }}</div>
+            <van-button plain type="primary" @click="handleRemove(index, btnConfigCopy)" size="mini" style="border: none; background: #ecebeb"
+                        :disabled="formOption.readonly" v-if="formOption.btnConfig !== undefined && formOption.btnConfig.isNeed">删除</van-button>
+          </div>
+          <!-- 循环表单数据 -->
+          <div v-for="(i, sonIndex) in btnConfigCopy.listConfig" :key="i.prop">
+            <van-field v-if="i.type == 'input'" v-model="formData[btnConfigCopy.prop][index][i.prop]" :label="i.label" :name="i.prop"
+                       :type="i.itemType ? i.itemType : 'text'" :placeholder="i.placeholder ? i.placeholder : '请输入'"
+                       :clearable="i.clearable ? i.clearable : false" :readonly="getFieldReadonly(i)" :rules="getRules(i)" :required="getRequired(i)"
+                       @change="
               (val) => {
                 return i.changeFn ? i.changeFn(index, val) : () => {};
               }
             ">
-          </van-field>
-          <!-- 单选 -->
-          <van-field v-if="i.type == 'picker' && i.itemType == 'onePicker'" :label="i.label" :name="i.prop"
-                     v-model="formData[btnConfigCopy.prop][index][i.prop + 'Name']" is-link :readonly="true"
-                     :placeholder="i.placeholder ? i.placeholder : '请选择'" @click="handleListItemClick(i, index, sonIndex)" :rules="getRules(i)"
-                     :required="getRequired(i)">
-            <template #input v-if="i.isShowScanCode">
-              <div style="display: flex; height: 24px">
-                <div style="width: calc(100vw - 100px)">
-                  {{ formData[btnConfigCopy.prop][index][i.prop + "Name"] }}
+            </van-field>
+            <!-- 单选 -->
+            <van-field v-if="i.type == 'picker' && i.itemType == 'onePicker'" :label="i.label" :name="i.prop"
+                       v-model="formData[btnConfigCopy.prop][index][i.prop + 'Name']" is-link :readonly="true"
+                       :placeholder="i.placeholder ? i.placeholder : '请选择'" @click="handleListItemClick(i, index, sonIndex)" :rules="getRules(i)"
+                       :required="getRequired(i)">
+              <template #input v-if="i.isShowScanCode">
+                <div style="display: flex; height: 24px">
+                  <div style="width: calc(100vw - 100px)">
+                    {{ formData[btnConfigCopy.prop][index][i.prop + "Name"] }}
+                  </div>
+                  <div style="width: 100px; float: right; margin-top: -20px">
+                    <van-button plain type="primary" @click.native.stop="i.scanCode(index)" size="mini" style="border: none">扫码</van-button>
+                  </div>
                 </div>
-                <div style="width: 100px; float: right; margin-top: -20px">
-                  <van-button plain type="primary" @click.native.stop="i.scanCode(index)" size="mini" style="border: none">扫码</van-button>
-                </div>
-              </div>
-            </template>
-          </van-field>
-          <!-- 时间选择器 -->
-          <van-field v-if="i.type == 'picker' && i.itemType == 'datePicker'" :label="i.label" :name="i.prop"
-                     v-model="formData[btnConfigCopy.prop][index][i.prop]" is-link :readonly="true"
-                     :placeholder="i.placeholder ? i.placeholder : '请选择'" @click="handleListItemClick(i, index, sonIndex)" :rules="getRules(i)"
-                     :required="getRequired(i)">
-          </van-field>
+              </template>
+            </van-field>
+            <!-- 时间选择器 -->
+            <van-field v-if="i.type == 'picker' && i.itemType == 'datePicker'" :label="i.label" :name="i.prop"
+                       v-model="formData[btnConfigCopy.prop][index][i.prop]" is-link :readonly="true"
+                       :placeholder="i.placeholder ? i.placeholder : '请选择'" @click="handleListItemClick(i, index, sonIndex)" :rules="getRules(i)"
+                       :required="getRequired(i)">
+            </van-field>
+          </div>
+        </van-cell-group>
+      </template>
+
+      <template v-if="btnConfigCopy &&formData[btnConfigCopy.prop] && formData[btnConfigCopy.prop].length==0">
+        <div style="width:100%;padding: 10px   20px">
+          无
         </div>
-      </van-cell-group>
+      </template>
+
       <!-- 单独写个循环，保证弹窗唯一 -->
       <div v-for="(item, index) in btnConfigCopy.listConfig" :key="index">
         <van-popup v-model:show="item.showPicker" round position="bottom" v-if="item.type == 'picker' && item.itemType == 'onePicker'">
@@ -331,12 +340,12 @@ const selectDataEcho = (item, val) => {
     const valueAtt = item.fieldNames
       ? item.fieldNames.value
       : onePickerFieldNames.value;
-    const current = item.data.find((x) => x[valueAtt] === val);
+    const current = item.data.find((x) => x[valueAtt] == val);
     return current ? current[textAtt] : "";
   } else if (item.type === "cascader" && item.itemType === "common") {
     const textAtt = item.fieldNames ? item.fieldNames.text : fieldNames.text;
     const valueAtt = item.fieldNames ? item.fieldNames.value : fieldNames.value;
-    const childrenAtt = item.fieldNames
+    const childrenAtt = item.fieldNames.children
       ? item.fieldNames.children
       : fieldNames.children;
     const arr = item.data ? item.data : [];

src/views/MES/productionOrder/details.vue

@@ -156,6 +156,20 @@ const formConfig = reactive([
   },
   {
     type: "input",
+    label: "完工时间",
+    prop: "finishTime",
+    itemType: "text",
+    readonly: true,
+  },
+  {
+    type: "input",
+    label: "是否逾期",
+    prop: "isOverdue",
+    itemType: "text",
+    readonly: true,
+  },
+  {
+    type: "input",
     label: "生产指示",
     prop: "prodTagName",
     itemType: "text",
@@ -166,6 +180,7 @@ const onClickLeft = () => history.back();
 onMounted(() => {
   if (route.query && route.query.data) {
     formData.data = JSON.parse(route.query.data);
+    formData.data.isOverdue = formData.data.isOverdue == "1" ? "是" : "否";
     getDict();
   }
 });

src/views/MES/productionReport/add.vue

@@ -29,7 +29,7 @@
               </div>
             </template>
           </van-field>
-          <van-field v-model="formData.quantity" readonly label="数量" />
+          <van-field v-model="formData.quantity" readonly label="生产总量" />
         </van-cell-group>
         <div style="height:20px"></div>
         <TitleInfo :title="'原材料信息'"></TitleInfo>
@@ -66,6 +66,7 @@
         <van-cell-group inset>
           <van-field v-model="submitData.productionProcessesIdName" is-link label="工序" readonly :placeholder="'请选择工序'" @click="showPicker = true"
                      :rules="[{ required: true, message: '请选择工序'}]" required />
+          <van-field v-model="formData.quantity" readonly label="生产总量" />
           <van-field v-model="formData.finishQuantity" readonly label="已报工数量" />
           <van-field v-model="submitData.quantity" label="数量" :type="'digit'" :rules="[{ required: true, message: '请输入数量'}]" required />
           <van-field v-model="submitData.userSetName" is-link label="报工人" readonly :placeholder="'请选择报工人'" @click="showPickerOne = true"
@@ -210,6 +211,7 @@ const getDetail = () => {
           value: x.processesId,
         }));
         formData.value = res.data;
+        formData.value.finishQuantity = "";
         formData.value.productSize = `${res.data.productLength} * ${res.data.productWidth} * ${res.data.productHeight}`;
         formData.value.materialSize = `${res.data.rawMaterialLength} * ${res.data.rawMaterialWidth} * ${res.data.rawMaterialHeight}`;
         let ids = [formData.value.productId];

src/views/MES/supplementaryOrder/add.vue

@@ -50,11 +50,11 @@ const formConfig = reactive([
     },
     data: [
       {
-        label: "补单",
+        label: "报损",
         value: 1,
       },
       {
-        label: "丢失",
+        label: "丢件",
         value: 2,
       },
     ],

src/views/processApproval/components/EhsdContract.vue

@@ -162,7 +162,7 @@ const formConfigCode = reactive([
   },
   {
     type: "cascader",
-    label: "归属公司",
+    label: "生产公司",
     prop: "companyId",
     itemType: "common",
     showPicker: false,
@@ -691,6 +691,19 @@ const formAmountProjectConfig = reactive([
     title: "合同模板",
   },
   {
+    type: "picker",
+    label: "合同模板",
+    prop: "contractTemplateId",
+    itemType: "onePicker",
+    showPicker: false,
+    readonly: false,
+    fieldNames: {
+      text: "label",
+      value: "value",
+    },
+    data: [],
+  },
+  {
     type: "slot",
     slotName: "templateContent",
     label: "模板内容",
@@ -971,6 +984,19 @@ const getDict = () => {
         });
       }
     });
+  // 合同模板
+  proxy
+    .post("/contractTemplate/page", {
+      pageNum: 1,
+      pageSize: 999,
+      templateType: "1",
+    })
+    .then((res) => {
+      formAmountProjectConfig[1].data = res.data.rows.map((x) => ({
+        label: x.templateName,
+        value: x.id,
+      }));
+    });
 
   // if (["10", "20"].includes(route.query.processType)) {
   //   proxy
@@ -1123,6 +1149,7 @@ onMounted(() => {
       for (const key in res.data) {
         formData.data[key] = res.data[key];
       }
+      formData.data.companyIdName = formData.data.companyName;
       formData.data.sellCity =
         formData.data.sellCountryName +
         " " +
@@ -1170,7 +1197,8 @@ onMounted(() => {
       setTimeout(() => {
         formDom1.value.formDataShowLabelOne();
         formDom2.value.formDataShowLabelOne();
-      }, 200);
+        formDom5.value.formDataShowLabelOne();
+      }, 300);
     });
   }
 });

src/views/processApproval/components/EhsdPurchase.vue

@@ -680,7 +680,11 @@ const getDict = () => {
   };
   // 合同模板
   proxy
-    .post("/contractTemplate/page", { pageNum: 1, pageSize: 999 })
+    .post("/contractTemplate/page", {
+      pageNum: 1,
+      pageSize: 999,
+      templateType: "2",
+    })
     .then((res) => {
       formAmountProjectConfig[1].data = res.data.rows.map((item) => {
         return {
@@ -915,7 +919,8 @@ onMounted(() => {
       setTimeout(() => {
         formDom1.value.formDataShowLabelOne();
         formDom2.value.formDataShowLabelOne();
-      }, 200);
+        formDom4.value.formDataShowLabelOne();
+      }, 300);
     });
   }
 });

src/views/procurementManagement/priceConfig/edit.vue

@@ -1,39 +1,33 @@
 <template>
-    <div class="form">
-        <van-nav-bar :title="$t('priceConfig.name')" :left-text="$t('common.back')" left-arrow @click-left="onClickLeft">
-        </van-nav-bar>
-        <van-form @submit="editSubmit" label-align="top" style="margin-top: 20px">
-            <van-cell-group inset>
-                <van-field v-model="formData.supplierInfoName" is-link readonly :label="$t('priceConfig.supplier')"
-                    :placeholder="$t('priceConfig.selectSupplier')"
-                    />
-                <van-popup v-model:show="typeModal" round position="bottom">
-                    <van-picker :columns="columns" @cancel="typeModal = false" @confirm="onConfirm" />
-                </van-popup>
-                <van-field v-model="formData.productInfoName" is-link readonly :label="$t('priceConfig.itemName')"
-                    :placeholder="$t('priceConfig.selectItemName')"
-                    v-if="route.query.id" />
-
-                <van-field v-model="formData.price" :label="$t('priceConfig.supplyUnitPrice')"
-                    :placeholder="$t('priceConfig.pleaseEnterSupplyUnitPrice')"
-                    :rules="[{ required: true, message: $t('priceConfig.supplyUnitPriceCanNotBeEmpty')}]" required v-if="route.query.id" />
-                <!-- 明细列表 -->
-                <van-popup v-model:show="typeModalOne" round position="bottom">
-                    <van-picker :columns="columnsOne" @cancel="typeModalOne = false"
-                        @confirm="(data) => onConfirmOne(data, index)" />
-                </van-popup>
-            </van-cell-group>
-
-            
-
-            <div style="margin: 16px">
-                <van-button round block type="primary" native-type="submit">
-                   {{$t('common.submit')}}
-                </van-button>
-            </div>
-            
-        </van-form>
-    </div>
+  <div class="form">
+    <van-nav-bar :title="$t('priceConfig.name')" :left-text="$t('common.back')" left-arrow @click-left="onClickLeft">
+    </van-nav-bar>
+    <van-form @submit="editSubmit" label-align="top" style="margin-top: 20px">
+      <van-cell-group inset>
+        <van-field v-model="formData.supplierInfoName" is-link readonly :label="$t('priceConfig.supplier')"
+                   :placeholder="$t('priceConfig.selectSupplier')" />
+        <van-popup v-model:show="typeModal" round position="bottom">
+          <van-picker :columns="columns" @cancel="typeModal = false" @confirm="onConfirm" />
+        </van-popup>
+        <van-field v-model="formData.productInfoName" is-link readonly :label="$t('priceConfig.itemName')"
+                   :placeholder="$t('priceConfig.selectItemName')" v-if="route.query.id" />
+
+        <van-field v-model="formData.price" :label="$t('priceConfig.supplyUnitPrice')" :placeholder="$t('priceConfig.pleaseEnterSupplyUnitPrice')"
+                   :rules="[{ required: true, message: $t('priceConfig.supplyUnitPriceCanNotBeEmpty')}]" required v-if="route.query.id" />
+        <!-- 明细列表 -->
+        <van-popup v-model:show="typeModalOne" round position="bottom">
+          <van-picker :columns="columnsOne" @cancel="typeModalOne = false" @confirm="(data) => onConfirmOne(data, index)" />
+        </van-popup>
+      </van-cell-group>
+
+      <div style="margin: 16px">
+        <van-button round block type="primary" native-type="submit">
+          {{$t('common.submit')}}
+        </van-button>
+      </div>
+
+    </van-form>
+  </div>
 </template>
   
 <script setup>
@@ -49,110 +43,111 @@ const typeModal = ref(false);
 const typeModalOne = ref(false);
 let selectIndex = ref(null);
 const formData = ref({
-    supplierInfoId: "",
-    type: "1",
-    supplierInfoName: "",
+  supplierInfoId: "",
+  type: "1",
+  supplierInfoName: "",
 });
 const list = ref([]);
 const handleAddRow = () => {
-    list.value.push({
-        productInfoId: "",
-        productInfoName: "",
-        price: "",
-    });
+  list.value.push({
+    productInfoId: "",
+    productInfoName: "",
+    price: "",
+  });
 };
 const getDict = () => {
-    proxy.post("/supplierInfo/page", { pageNum: 1, pageSize: 9999 }).then((res) => {
-        columns.value = res.data.rows.map((item) => {
-            return {
-                text: item.name,
-                value: item.id,
-            };
-        });
+  proxy
+    .post("/supplierInfo/page", { pageNum: 1, pageSize: 9999 })
+    .then((res) => {
+      columns.value = res.data.rows.map((item) => {
+        return {
+          text: item.name,
+          value: item.id,
+        };
+      });
     });
 
-    proxy
-        .post("/productInfo/page", { pageNum: 1, pageSize: 9999, definition: "1" })
-        .then((res) => {
-            columnsOne.value = res.data.rows.map((item) => {
-                return {
-                    text: item.name,
-                    value: item.id,
-                };
-            });
-        });
+  proxy
+    .post("/productInfo/page", { pageNum: 1, pageSize: 9999, definition: "1" })
+    .then((res) => {
+      columnsOne.value = res.data.rows.map((item) => {
+        return {
+          text: item.name,
+          value: item.id,
+        };
+      });
+    });
 };
 
-
 const columns = ref([]);
 const columnsOne = ref([]);
 
 const onConfirm = ({ selectedOptions }) => {
-    formData.value.supplierInfoId = selectedOptions[0].value;
-    formData.value.supplierInfoName = selectedOptions[0].text;
-    typeModal.value = false;
+  formData.value.supplierInfoId = selectedOptions[0].value;
+  formData.value.supplierInfoName = selectedOptions[0].text;
+  typeModal.value = false;
 };
 
-const onConfirmOne = ({selectedOptions}) => {
-    formData.value.productInfoId = selectedOptions[0].value;
-    formData.value.productInfoName = selectedOptions[0].text;
-    typeModalOne.value = false;
+const onConfirmOne = ({ selectedOptions }) => {
+  formData.value.productInfoId = selectedOptions[0].value;
+  formData.value.productInfoName = selectedOptions[0].text;
+  typeModalOne.value = false;
 };
 
 const handleSelect = (index) => {
-    typeModalOne.value = true;
+  typeModalOne.value = true;
 };
 
 const handleDel = (index) => {
-    list.value.splice(index, 1);
+  list.value.splice(index, 1);
 };
 
 const onClickLeft = () => history.back();
 
 const editSubmit = () => {
-    console.log(formData.value)
-    console.log(route.query)
-    proxy.post("/supplierPrice/edit", formData.value).then(
-        (res) => {
-            setTimeout(() => {
-                showSuccessToast(proxy.$t("common.modifySuccess"));
-                proxy.$router.push("/main/priceConfig");
-            }, 500);
-        },
-        (err) => {
-            return showFailToast(err.message);
-        }
-    );
+  console.log(formData.value);
+  console.log(route.query);
+  proxy.post("/supplierPrice/edit", formData.value).then(
+    (res) => {
+      setTimeout(() => {
+        showSuccessToast(proxy.$t("common.modifySuccess"));
+        proxy.$router.push("/main/priceConfig");
+      }, 500);
+    },
+    (err) => {
+      return showFailToast(err.message);
+    }
+  );
 };
 
 onMounted(() => {
-    console.log(route.query)
-    formData.value = {
-        supplierInfoName: route.query.supplierName,
-        productInfoName: route.query.productClassifyName,
-        id: route.query.id,
-        supplierInfoId: route.query.supplierInfoId,
-        productInfoId: route.query.productInfoId,
-        price: route.query.price,
-    }
-    getDict();
+  console.log(route.query);
+  formData.value = {
+    supplierInfoName: route.query.supplierName,
+    productInfoName: route.query.productClassifyName,
+    id: route.query.id,
+    supplierInfoId: route.query.supplierInfoId,
+    productInfoId: route.query.productInfoId,
+    price: route.query.price,
+  };
+  getDict();
 });
 </script>
 <style lang="scss" scoped>
 .row {
-    display: flex;
-    padding: 5px 10px 0 10px;
-    justify-content: space-between;
-    align-items: center;
-
-    .title {
-        flex: 1;
-    }
-
-    .delete {
-        width: 20px;
-        cursor: pointer;
-        text-align: center;
-    }
+  display: flex;
+  padding: 5px 10px 0 10px;
+  justify-content: space-between;
+  align-items: center;
+
+  .title {
+    flex: 1;
+  }
+
+  .delete {
+    width: 20px;
+    cursor: pointer;
+    text-align: center;
+  }
 }
 </style>

src/views/procurementManagement/priceConfig/index.vue

@@ -1,122 +1,102 @@
 <template>
-    <van-nav-bar
-      :title="$t('priceConfig.name')"
-      left-text=""
-      left-arrow
-      @click-left="onClickLeft"
-      @click-right="onClickRight"
-    >
-      <template #right> {{$t('common.add')}} </template>
-    </van-nav-bar>
-    <van-search
-      v-model="req.keyword"
-      :placeholder="$t('common.pleaseEnterKeywords')"
-      @search="onRefresh"
-    />
-    <van-pull-refresh v-model="loading" @refresh="onRefresh">
-      <div class="list">
-        <van-list
-          v-model:loading="loading"
-          :finished="finished"
-          :finished-text="$t('common.noMore')"
-          @load="onLoad"
-          style="margin-bottom: 60px"
-        >
-          <commonList
-            :data="listData"
-            @onClick="toDtl"
-            :config="listConfig"
-          ></commonList>
-        </van-list>
-      </div>
-    </van-pull-refresh>
-  </template>
+  <van-nav-bar :title="$t('priceConfig.name')" left-text="" left-arrow @click-left="onClickLeft" @click-right="onClickRight">
+    <!-- <template #right> {{$t('common.add')}} </template> -->
+  </van-nav-bar>
+  <van-search v-model="req.keyword" :placeholder="$t('common.pleaseEnterKeywords')" @search="onRefresh" />
+  <van-pull-refresh v-model="loading" @refresh="onRefresh">
+    <div class="list">
+      <van-list v-model:loading="loading" :finished="finished" :finished-text="$t('common.noMore')" @load="onLoad" style="margin-bottom: 60px">
+        <commonList :data="listData" @onClick="toDtl" :config="listConfig"></commonList>
+      </van-list>
+    </div>
+  </van-pull-refresh>
+</template>
   <script setup>
-  import { ref, getCurrentInstance, onMounted } from "vue";
-  import commonList from "@/components/common-list.vue";
-  import { useRoute } from "vue-router";
-  const loading = ref(false);
-  const router = useRoute();
-  const req = ref({
-    pageNum: 1,
-    type: "1",
-    keyword: null,
-  });
-  const finished = ref(false);
-  const proxy = getCurrentInstance().proxy;
-  const listData = ref([]);
-  
-  const listConfig = ref([
-    {
-      label: proxy.t('priceConfig.supplier'),
-      prop: "supplierName",
-    },
-    {
-      label: proxy.t('priceConfig.itemName'),
-      prop: "productName",
+import { ref, getCurrentInstance, onMounted } from "vue";
+import commonList from "@/components/common-list.vue";
+import { useRoute } from "vue-router";
+const loading = ref(false);
+const router = useRoute();
+const req = ref({
+  pageNum: 1,
+  type: "1",
+  keyword: null,
+});
+const finished = ref(false);
+const proxy = getCurrentInstance().proxy;
+const listData = ref([]);
+
+const listConfig = ref([
+  {
+    label: proxy.t("priceConfig.supplier"),
+    prop: "supplierName",
+  },
+  {
+    label: proxy.t("priceConfig.itemName"),
+    prop: "productName",
+  },
+  {
+    label: proxy.t("priceConfig.supplyUnitPrice"),
+    prop: "price",
+  },
+]);
+const onRefresh = () => {
+  req.value.pageNum = 1;
+  finished.value = false;
+  getList("refresh");
+};
+const onLoad = () => {
+  getList();
+};
+
+const onClickLeft = () => {
+  proxy.$router.push("/main/working");
+};
+
+const onClickRight = () => {
+  proxy.$router.push({
+    path: "priceConfigAdd",
+    query: {
+      type: "add",
     },
-    {
-      label: proxy.t('priceConfig.supplyUnitPrice'),
-      prop: "price",
+  });
+};
+proxy.uploadDdRightBtn(onClickRight, proxy.t("common.add"));
+const toDtl = (row) => {
+  proxy.$router.push({
+    path: "priceConfigEdit",
+    query: {
+      ...row,
+      type: "edit",
     },
-  ]);
-  const onRefresh = () => {
-    req.value.pageNum = 1;
-    finished.value = false;
-    getList("refresh");
-  };
-  const onLoad = () => {
-    getList();
-  };
-  
-  const onClickLeft = () => {
-    proxy.$router.push("/main/working");
-  }
-  
-  const onClickRight = () => {
-    proxy.$router.push({
-      path: "priceConfigAdd",
-      query: {
-        type:'add'
-      },
-    });
-  };
-  proxy.uploadDdRightBtn(onClickRight,proxy.t('common.add'))
-  const toDtl = (row) => {
-    proxy.$router.push({
-      path: "priceConfigEdit",
-      query: {
-        ...row,
-        type:'edit'
-      },
+  });
+};
+
+const getList = (type) => {
+  loading.value = true;
+  proxy
+    .post("/supplierPrice/page", req.value)
+    .then((res) => {
+      console.log(req.value);
+      listData.value =
+        type === "refresh"
+          ? res.data.rows
+          : listData.value.concat(res.data.rows);
+      if (req.value.pageNum * 10 >= res.data.total) {
+        finished.value = true;
+      }
+      req.value.pageNum++;
+      loading.value = false;
+    })
+    .catch((err) => {
+      loading.value = false;
     });
-  };
-  
-  const getList = (type) => {
-    loading.value = true;
-    proxy
-      .post("/supplierPrice/page", req.value)
-      .then((res) => {
-        console.log(req.value);
-        listData.value =
-          type === "refresh"
-            ? res.data.rows
-            : listData.value.concat(res.data.rows);
-        if (req.value.pageNum * 10 >= res.data.total) {
-          finished.value = true;
-        }
-        req.value.pageNum++;
-        loading.value = false;
-      })
-      .catch((err) => {
-        loading.value = false;
-      });
-  };
-  getList();
-  </script>
+};
+getList();
+</script>
   
   <style lang="scss" scoped>
-  .list {
-    min-height: 70vh;
-  }
-  </style>
+.list {
+  min-height: 70vh;
+}
+</style>

src/views/procurementManagement/supplierConfig/add.vue

@@ -41,6 +41,13 @@ const formOption = reactive({
 });
 const formConfig = reactive([
   {
+    type: "input",
+    itemType: "text",
+    label: "归属公司",
+    prop: "companyName",
+    readonly: true,
+  },
+  {
     type: "picker",
     label: "供应商类型",
     prop: "type",
@@ -98,6 +105,13 @@ const formConfig = reactive([
     clearable: true,
   },
   {
+    type: "input",
+    itemType: "text",
+    label: "传真",
+    prop: "fax",
+    clearable: true,
+  },
+  {
     type: "upload",
     label: "上传附件",
     prop: "fileList",
@@ -170,12 +184,13 @@ const onClickLeft = () => history.back();
 
 onMounted(async () => {
   const res = await proxy.getDictOne(["supplier_type"]);
-  formConfig[0].data = res["supplier_type"].data;
+  formConfig[1].data = res["supplier_type"].data;
   if (route.query.id) {
     formOption.readonly = true;
     formOption.hiddenSubmitBtn = true;
     proxy.post("/supplierInfo/detail", { id: route.query.id }).then((res) => {
       formData.data = res.data;
+      formData.data.companyName = route.query.name;
       formData.data.countryCityName =
         formData.data.countryName +
         " " +

src/views/procurementManagement/supplierConfig/index.vue

@@ -65,6 +65,7 @@ const toDtl = (row) => {
     query: {
       id: row.id,
       type: "edit",
+      name: row.companyName,
     },
   });
 };

src/views/production/technology/add.vue

@@ -157,11 +157,11 @@ const formConfig = reactive([
     },
     data: [
       {
-        value: "0",
+        value: 0,
         label: "关闭批量模式",
       },
       {
-        value: "1",
+        value: 1,
         label: "开启批量模式",
       },
     ],
@@ -279,21 +279,11 @@ onMounted(() => {
   if (route.query.id) {
     formOption.readonly = true; //全部只读
     formOption.hiddenSubmitBtn = true; //隐藏提交按钮
-    formData.data = { ...route.query };
-    // proxy
-    //   .post("/technology/detail", { id: route.query.id })
-    //   .then((resDetail) => {
-    //     formData.data = {
-    //       ...resDetail.data,
-    //       processRouteList: resDetail.data.processRouteList.map(
-    //         (item) => item.id
-    //       ),
-    //       applicableProductsList: resDetail.data.applicableProductsList.map(
-    //         (item) => item.id
-    //       ),
-    //     };
-    //     getDtl();
-    //   });
+    // formData.data = { ...route.query };
+    proxy.post("/technology/detail", { id: route.query.id }).then((res) => {
+      formData.data = res.data;
+      formData.data.processRouteNameLists = route.query.processRouteNameLists;
+    });
   } else {
     // getDtl()
   }

src/views/salesContract/contract/index.vue

@@ -124,7 +124,7 @@ const listConfig = ref([
     prop: "code",
   },
   {
-    label: proxy.t("contract.sellCorporation"),
+    label: "生产公司",
     prop: "companyName",
   },
   {

src/views/salesContract/priceSheet/add.vue

@@ -42,7 +42,7 @@
             <div>商品编码：{{product.productCode}}</div>
             <div>尺寸(cm)：{{product.size}}</div>
             <div style="display:flex;">
-              <span>数量：{{product.quantity}}</span><span style="margin-left:15px">单价：{{product.price}}</span><span
+              <span>数量：{{product.quantity}}</span><span style="margin-left:15px">单价：￥{{product.price}}</span><span
                     style="margin-left:15px">小计：{{product.amount}}</span>
             </div>
           </template>
@@ -72,7 +72,7 @@
                     <td>{{item.size}}</td>
                     <td>{{item.quantity}}</td>
                     <td>{{item.allQuantity}}</td>
-                    <td>{{item.price}}</td>
+                    <td>￥{{item.price}}</td>
                     <td>{{item.amount}}</td>
                     <td>{{item.remark}}</td>
                   </tr>