dengrui hai 1 ano
pai
achega
cdef688fd3

+ 16 - 21
src/views/device/instance/index.vue

@@ -38,7 +38,7 @@
           @click="showParamsPage(row)"
           >模型
           <template #icon>
-            <svg-icon icon-class="moxing"></svg-icon>
+            <svg-icon icon-class="moxing" />
           </template>
         </el-button>
       </template>
@@ -93,22 +93,22 @@
         style="height: 280px"
       >
         <el-table-column label="参数" prop="fieldCode">
-          <template v-slot="{ row }">
+          <template #default="{ row }">
             <el-input v-model="row.fieldCode" />
           </template>
         </el-table-column>
         <el-table-column label="参数名称" prop="fieldLabel">
-          <template v-slot="{ row }">
+          <template #default="{ row }">
             <el-input v-model="row.fieldLabel" />
           </template>
         </el-table-column>
         <el-table-column label="参数值" prop="fieldValue">
-          <template v-slot="{ row }">
+          <template #default="{ row }">
             <el-input v-model="row.fieldValue" />
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center">
-          <template v-slot="{ row }">
+          <template #default="{ row }">
             <el-button
               type="danger"
               @click="minusItem(row)"
@@ -120,30 +120,25 @@
         </el-table-column>
       </el-table>
       <div class="dialog-footer" style="margin-top: 20px" align="center">
-        <el-button
-          type="primary"
-          v-if="pageData.length > 0"
-          @click="handleSubmit"
-          >保 存</el-button
-        >
+        <el-button type="primary" @click="handleSubmit">保 存</el-button>
         <el-button @click="dialog.visible = false">取消</el-button>
       </div>
     </el-dialog>
     <el-dialog
-        v-model="dialog2.visible"
-        :title="dialog2.title"
-        width="70%"
-        @close="dialog2.visible = false"
+      v-model="dialog2.visible"
+      :title="dialog2.title"
+      width="70%"
+      @close="dialog2.visible = false"
     >
-      <choice-workshop-page @workShopInfo="workShopInfo" />
+      <choice-workshop-page @work-shop-info="workShopInfo" />
     </el-dialog>
     <el-dialog
-        v-model="dialog3.visible"
-        :title="dialog3.title"
-        width="70%"
-        @close="dialog3.visible = false"
+      v-model="dialog3.visible"
+      :title="dialog3.title"
+      width="70%"
+      @close="dialog3.visible = false"
     >
-      <choice-station-page @stationInfo="stationInfo" />
+      <choice-station-page @station-info="stationInfo" />
     </el-dialog>
     <ExcelUpload ref="uploadRef" @finished="uploadFinished" />
   </div>

+ 2 - 2
src/views/plan/workOrder/index.vue

@@ -482,7 +482,7 @@ const workShopInfo = (value) => {
   form.value.workshopName = value.id;
   form.value.workshopCode = value.code;
   form.value.workshopName = value.name;
-  form.value.productLineId = ""
+  form.value.productLineId = "";
   form.value.productLineName = "";
   dialog2.visible = false;
 };
@@ -686,7 +686,7 @@ option.value = Object.assign(option.value, {
       ],
       click: ({ value, column }) => {
         if (column.boxType) {
-          if (!form.value.workshopCode) {
+          if (!form.value.workshopName) {
             ElMessage({
               message: "请先选择生产车间",
               type: "warning",

+ 1 - 1
src/views/storage/vehicleMaterial/index.vue

@@ -129,7 +129,7 @@
       },
       {
         label: "物料编号",
-        prop: "code",
+        prop: "materialCode",
         hide:true,
         click:({ value, column }) => {
           ctableRef.value.startSelect();