修改bug

src/views/InTheSystem/index.vue

@@ -132,6 +132,27 @@
             width: 120,
             showOverflowTooltip: true
           },
+          {
+            width: 150,
+            prop: 'modelType',
+            label: '型号',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            width: 150,
+            prop: 'specification',
+            label: '规格',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'colorKey',
+            label: '颜色',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'workstationName',
             label: '工位',

src/views/produce/components/feeding/details.vue

@@ -112,7 +112,7 @@
               Object.prototype.hasOwnProperty.call(it, 'palletList') &&
               it.palletList.length != 0
             "
-            :palletList="it.palletList"
+            :list="it.palletList"
           ></palletBom>
 
           <revolvingDiskBom
@@ -120,7 +120,7 @@
               Object.prototype.hasOwnProperty.call(it, 'revolvingDiskList') &&
               it.revolvingDiskList.length != 0
             "
-            :revolvingDiskList="it.revolvingDiskList"
+            :list="it.revolvingDiskList"
           ></revolvingDiskBom>
         </div>
       </div>
@@ -137,7 +137,7 @@
   // import semiProductBom from './components/semiProductBom';
   import packingBom from './components/packingBom.vue';
   import palletBom from './components/palletBom';
-  import revolvingDiskBom from './components/revolvingDiskBom';
+  import revolvingDiskBom from './components/revolvingDiskBom.vue';
   import productsBom from './components/productsBom.vue';
   import batchProductsBom from './components/batchProductsBom.vue';
   import turnoverBom from './components/turnoverBom.vue';

src/views/produce/components/jobBooking/details.vue

@@ -277,6 +277,7 @@
             <detailsIndex
               :code="objData.code"
               :taskId="objData.currentTaskDiagram.sourceTaskId"
+              :isDetails="true"
             >
             </detailsIndex>
           </div>

src/views/produce/components/outsourcing/index.vue

@@ -496,9 +496,9 @@
     mounted() {
       this.getContactList();
       this.getFactoryList();
-      console.log(this.chooseType, '委托');
+      console.log(this.taskName, '委托');
       if (this.chooseType == '1') {
-        this.attributeData.name = this.taskName + '委托';
+        this.attributeData.name = this.taskName + '委外';
         // this.$set(this.outsourceFormVal, 'name', this.taskName + '委托');
       } else if (this.chooseType == '2') {
         this.attributeData.name = this.taskName + '请托';

src/views/produceOrder/workReport.vue

@@ -208,7 +208,7 @@
                       ></outsourcingDetails>
                       <outsourcing
                         :outsourceFormVal="outsourceForm"
-                        :taskName="taskObj.name"
+                        :taskName="taskObj.taskTypeName"
                         @changePlugIn="changePlugIn"
                         @changeCancel="changeCancel"
                         :chooseType="chooseType"