695593266@qq.com преди 6 месеца
родител
ревизия
5649f45e50
променени са 2 файла, в които са добавени 39 реда и са изтрити 5 реда
  1. 37 3
      src/views/bpm/handleTask/components/selectedCollectionOutbound/detailDialog.vue
  2. 2 2
      vue.config.js

+ 37 - 3
src/views/bpm/handleTask/components/selectedCollectionOutbound/detailDialog.vue

@@ -13,6 +13,41 @@
             <el-input v-model="form.code" disabled></el-input>
             <el-input v-model="form.code" disabled></el-input>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="物品编码" prop="code">
+            <el-input v-model="form.categoryCode" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="物品名称" prop="code">
+            <el-input v-model="form.categoryName" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="型号" prop="code">
+            <el-input v-model="form.modelType" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="规格" prop="code">
+            <el-input v-model="form.specification" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="计量单位" prop="code">
+            <el-input v-model="form.unit" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="机型" prop="code">
+            <el-input v-model="form.modelKey" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="颜色" prop="code">
+            <el-input v-model="form.colorKey" disabled></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
         <el-col :span="8">
           <el-form-item label="领料时间" prop="createTime">
           <el-form-item label="领料时间" prop="createTime">
             <el-input v-model="form.createTime" disabled></el-input>
             <el-input v-model="form.createTime" disabled></el-input>
@@ -44,10 +79,9 @@
         </el-col>
         </el-col>
       </el-row>
       </el-row>
     </el-form>
     </el-form>
-    <el-table :data="form.detailList" style="width: 100%">
+    <!-- <el-table :data="form.detailList" style="width: 100%">
       <el-table-column prop="code" label="领料单号"> </el-table-column>
       <el-table-column prop="code" label="领料单号"> </el-table-column>
       <el-table-column prop="workOrderCode" label="工单编号"> </el-table-column>
       <el-table-column prop="workOrderCode" label="工单编号"> </el-table-column>
-      <!-- <el-table-column prop="workOrderId" label="工单编号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="物品编码"> </el-table-column>
       <el-table-column prop="categoryCode" label="物品编码"> </el-table-column>
       <el-table-column prop="categoryName" label="物品名称"> </el-table-column>
       <el-table-column prop="categoryName" label="物品名称"> </el-table-column>
       <el-table-column label="数量">
       <el-table-column label="数量">
@@ -60,7 +94,7 @@
           {{ row.warehouseName }}
           {{ row.warehouseName }}
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-    </el-table>
+    </el-table> -->
   </div>
   </div>
 </template>
 </template>
 
 

+ 2 - 2
vue.config.js

@@ -41,8 +41,8 @@ module.exports = {
 
 
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.251:18086',
-        target: 'http://192.168.1.3:18086',
-
+        // target: 'http://192.168.1.3:18086',
+        target: 'http://aiot.zoomwin.com.cn:51001/api',
         // target: 'http://192.168.1.3:18086',
         // target: 'http://192.168.1.3:18086',
         // target: 'http://192.168.1.116:18086', // 赵沙金
         // target: 'http://192.168.1.116:18086', // 赵沙金