浏览代码

fix: 调整需求

jiaxing.liao 1 周之前
父节点
当前提交
77d6171fb2
共有 5 个文件被更改,包括 52 次插入23 次删除
  1. 11 0
      src/components/Sheet.vue
  2. 19 13
      src/pages/excel/ConfigDrawerProduction.vue
  3. 17 7
      src/pages/excel/ConfigDrawerProject.vue
  4. 4 2
      src/pages/excel/index.vue
  5. 1 1
      stats.html

+ 11 - 0
src/components/Sheet.vue

@@ -200,6 +200,17 @@ onMounted(() => {
     props?.workbook || {}
     props?.workbook || {}
   );
   );
 
 
+  // 判断是否禁用
+  univerAPI.addEvent(univerAPI.Event.BeforeSheetEditStart, (params) => {
+    const { workbook } = params
+    const cell = workbook.getActiveCell();
+    const cellData = cell?.getCellData();
+    if(cellData && cellData.custom?.disabled_edit) {
+      // 如果想阻止进入编辑状态
+      params.cancel = true
+    }
+  });
+
   univerInstance = univer;
   univerInstance = univer;
   univerAPIInstance = univerAPI;
   univerAPIInstance = univerAPI;
   props?.created?.(univer, univerAPI);
   props?.created?.(univer, univerAPI);

+ 19 - 13
src/pages/excel/ConfigDrawerProduction.vue

@@ -61,7 +61,7 @@
               </el-button>
               </el-button>
               <el-button
               <el-button
                 type="text"
                 type="text"
-                v-if="!isEmpty"
+                :disabled="isEmpty || erpCodeDisabled"
                 @click="handleEmptyErpCode"
                 @click="handleEmptyErpCode"
               >
               >
                 置空
                 置空
@@ -192,7 +192,7 @@
         <!-- 零件属性 -->
         <!-- 零件属性 -->
         <el-col :span="12">
         <el-col :span="12">
           <el-form-item label="零件属性" name="part_attribute">
           <el-form-item label="零件属性" name="part_attribute">
-            <el-select disabled placeholder="">
+            <el-select disabled placeholder="" v-model="formData.part_attribute">
               <el-option
               <el-option
                 v-for="item in partAttributeOptions.map((item) => ({
                 v-for="item in partAttributeOptions.map((item) => ({
                   label: item,
                   label: item,
@@ -240,7 +240,7 @@
           ><el-form-item label="标准用量" name="qty">
           ><el-form-item label="标准用量" name="qty">
             <el-input-number
             <el-input-number
               disabled
               disabled
-              class="inline-block w-full!"
+              style="width: 100%"
               placeholder="请输入"
               placeholder="请输入"
               v-model="formData.qty"
               v-model="formData.qty"
             />
             />
@@ -251,7 +251,7 @@
         <el-col :span="12">
         <el-col :span="12">
           <el-form-item label="工艺消耗" name="technology_consume">
           <el-form-item label="工艺消耗" name="technology_consume">
             <el-input-number
             <el-input-number
-              class="inline-block w-full!"
+              style="width: 100%"
               placeholder="请输入"
               placeholder="请输入"
               v-model="formData.technology_consume"
               v-model="formData.technology_consume"
             />
             />
@@ -262,7 +262,7 @@
         <el-col :span="12">
         <el-col :span="12">
           <el-form-item label="不良率%" name="nonperform_rate">
           <el-form-item label="不良率%" name="nonperform_rate">
             <el-input-number
             <el-input-number
-              class="inline-block w-full!"
+              style="width: 100%"
               placeholder="请输入"
               placeholder="请输入"
               v-model="formData.nonperform_rate"
               v-model="formData.nonperform_rate"
             >
             >
@@ -337,20 +337,21 @@
 
 
         <!-- 模腔数/取数(pcs) -->
         <!-- 模腔数/取数(pcs) -->
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="模腔数/取数(pcs)" prop="production_cycle">
+          <el-form-item label="模腔数/取数(pcs)" prop="cavities">
             <el-input-number
             <el-input-number
               :step="1"
               :step="1"
               :precision="0"
               :precision="0"
               placeholder="请输入"
               placeholder="请输入"
-              v-model="formData.production_cycle"
+              v-model="formData.cavities"
+              style="width: 100%"
             />
             />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
 
 
         <!-- 制造周期(S) -->
         <!-- 制造周期(S) -->
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="制造周期(S)" prop="cavities">
-            <el-input-number placeholder="请输入" v-model="formData.cavities" />
+          <el-form-item label="制造周期(S)" prop="production_cycle">
+            <el-input-number placeholder="请输入" v-model="formData.production_cycle" style="width: 100%" />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
 
 
@@ -362,6 +363,7 @@
               :precision="0"
               :precision="0"
               placeholder="请输入"
               placeholder="请输入"
               v-model="formData.holding_number"
               v-model="formData.holding_number"
+              style="width: 100%"
             />
             />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -372,6 +374,7 @@
             <el-input-number
             <el-input-number
               placeholder="请输入"
               placeholder="请输入"
               v-model="formData.single_piece"
               v-model="formData.single_piece"
+              style="width: 100%"
             />
             />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -401,6 +404,7 @@
               :precision="0"
               :precision="0"
               placeholder="请输入"
               placeholder="请输入"
               v-model="formData.snp"
               v-model="formData.snp"
+              style="width: 100%"
             />
             />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -411,7 +415,7 @@
             <el-input-number
             <el-input-number
               :step="1"
               :step="1"
               :precision="0"
               :precision="0"
-              class="inline-block w-full!"
+              style="width: 100%"
               placeholder="请输入"
               placeholder="请输入"
               v-model="formData.cycle_number"
               v-model="formData.cycle_number"
             />
             />
@@ -431,6 +435,7 @@
             <el-input-number
             <el-input-number
               placeholder="请输入"
               placeholder="请输入"
               v-model="formData.supplier_distance"
               v-model="formData.supplier_distance"
+              style="width: 100%"
             />
             />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -450,18 +455,19 @@
               :precision="0"
               :precision="0"
               placeholder="请输入"
               placeholder="请输入"
               v-model="formData.min_order"
               v-model="formData.min_order"
+              style="width: 100%"
             />
             />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
 
 
         <!-- 备注 -->
         <!-- 备注 -->
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="备注" name="remark">
+          <el-form-item label="备注" name="note">
             <el-input
             <el-input
               placeholder="请输入"
               placeholder="请输入"
               type="textarea"
               type="textarea"
               :rows="4"
               :rows="4"
-              v-model="formData.remark"
+              v-model="formData.note"
             />
             />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -633,7 +639,7 @@ const keyMap = {
   supplier_distance: "供货距离(KM)",
   supplier_distance: "供货距离(KM)",
   supply_code: "供应商编码",
   supply_code: "供应商编码",
   min_order: "最小起订量",
   min_order: "最小起订量",
-  remark: "备注",
+  note: "备注",
   picture: "简图",
   picture: "简图",
   engin_var1: "备用字段1",
   engin_var1: "备用字段1",
   engin_var2: "备用字段2",
   engin_var2: "备用字段2",

+ 17 - 7
src/pages/excel/ConfigDrawerProject.vue

@@ -61,6 +61,16 @@
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
 
 
+        <!-- 简图 -->
+        <el-col :span="12">
+          <el-form-item label="简图" prop="picture">
+            <el-input
+              readonly
+              v-model="formData.picture"
+            />
+          </el-form-item>
+        </el-col>
+
         <!-- NK零件号 -->
         <!-- NK零件号 -->
         <el-col :span="12">
         <el-col :span="12">
           <el-form-item label="NK零件号" name="erp_code">
           <el-form-item label="NK零件号" name="erp_code">
@@ -87,7 +97,7 @@
               </el-button>
               </el-button>
               <el-button
               <el-button
                 type="text"
                 type="text"
-                v-if="!isEmpty"
+                :disabled="isEmpty || erpCodeDisabled"
                 @click="handleEmptyErpCode"
                 @click="handleEmptyErpCode"
               >
               >
                 置空
                 置空
@@ -288,9 +298,9 @@
         <el-col :span="12"
         <el-col :span="12"
           ><el-form-item label="标准用量" name="qty">
           ><el-form-item label="标准用量" name="qty">
             <el-input-number
             <el-input-number
-              class="inline-block w-full!"
               placeholder="请输入"
               placeholder="请输入"
               v-model="formData.qty"
               v-model="formData.qty"
+              style="width: 100%"
             />
             />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -300,9 +310,9 @@
           <el-form-item label="工艺消耗" name="technology_consume">
           <el-form-item label="工艺消耗" name="technology_consume">
             <el-input-number
             <el-input-number
               disabled
               disabled
-              class="inline-block w-full!"
               placeholder="请输入"
               placeholder="请输入"
               v-model="formData.technology_consume"
               v-model="formData.technology_consume"
+              style="width: 100%"
             />
             />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -312,9 +322,9 @@
           <el-form-item label="不良率%" name="nonperform_rate">
           <el-form-item label="不良率%" name="nonperform_rate">
             <el-input-number
             <el-input-number
               disabled
               disabled
-              class="inline-block w-full!"
               placeholder="请输入"
               placeholder="请输入"
               v-model="formData.nonperform_rate"
               v-model="formData.nonperform_rate"
+              style="width: 100%"
             >
             >
               <template #suffix>
               <template #suffix>
                 <span>%</span>
                 <span>%</span>
@@ -367,12 +377,12 @@
 
 
         <!-- 备注 -->
         <!-- 备注 -->
         <el-col :span="12">
         <el-col :span="12">
-          <el-form-item label="备注" name="remark">
+          <el-form-item label="备注" name="note">
             <el-input
             <el-input
               placeholder="请输入"
               placeholder="请输入"
               type="textarea"
               type="textarea"
               :rows="4"
               :rows="4"
-              v-model="formData.remark"
+              v-model="formData.note"
             />
             />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -530,7 +540,7 @@ const keyMap = {
   supplier_distance: "供货距离(KM)",
   supplier_distance: "供货距离(KM)",
   supply_code: "供应商编码",
   supply_code: "供应商编码",
   min_order: "最小起订量",
   min_order: "最小起订量",
-  remark: "备注",
+  note: "备注",
   picture: "简图",
   picture: "简图",
   engin_var1: "备用字段1",
   engin_var1: "备用字段1",
   engin_var2: "备用字段2",
   engin_var2: "备用字段2",

+ 4 - 2
src/pages/excel/index.vue

@@ -77,7 +77,8 @@ const handleSave = () => {
         model: {
         model: {
           ...workbook,
           ...workbook,
           bom_id: route.query?.id,
           bom_id: route.query?.id,
-          version
+          version,
+          type
         },
         },
       },
       },
       (res: any) => {
       (res: any) => {
@@ -107,7 +108,8 @@ onMounted(() => {
     {
     {
       interfaceCode: "Common.getBOM2OnlineData",
       interfaceCode: "Common.getBOM2OnlineData",
       bom_id: route.query.id,
       bom_id: route.query.id,
-      type
+      type,
+      version
     },
     },
     (res: any) => {
     (res: any) => {
       if (res?.code) {
       if (res?.code) {

文件差异内容过多而无法显示
+ 1 - 1
stats.html