Browse Source

九方优化

saber 3 năm trước cách đây
mục cha
commit
df67536040

+ 6 - 4
src/views/BasicSettings/Materialfield.vue

@@ -70,11 +70,11 @@
             </FormItem>
             <FormItem label="子分类:">
               <Select v-model="classInfo.sub_type">
-                <Option value=0
+                <Option :value=0
                         label="无"></Option>
-                <Option value=1
+                <Option :value=1
                         label="胶水"></Option>
-                <Option value=2
+                <Option :value=2
                         label="包材"></Option>
               </Select>
             </FormItem>
@@ -123,8 +123,9 @@ export default {
       attribute: [{ title: '' }],
       repeatFlag: false,
       materialTypeList: []
-    }
+    }  
   },
+  
   mounted () {
     this.initData()
   },
@@ -173,6 +174,7 @@ export default {
         this.classInfo.id = obj.id;
         this.classInfo.title = obj.title;
         this.classInfo.type_id = obj.type_id;
+        this.classInfo.sub_type = obj.sub_type_id
       } else {
         //新增
         this.showType = 1

+ 2 - 2
src/views/BidSystem/ContractList/edit.vue

@@ -830,7 +830,7 @@ export default {
         { title: '操作', key: 'remark', align: 'center', slot: 'Set', minWidth: 120 },
       ],
       supTableColumns: [
-        { title: '序号', key: 'index', align: 'center' },
+        { title: '序号',type:'index', align: 'center' },
         { title: '辅料名称', key: 'title', align: 'center', slot: 'combine', minWidth: 60 },
         { title: '操作', key: 'set', align: 'center', slot: 'supSet' },
       ],
@@ -1305,7 +1305,7 @@ export default {
       // this.supTableData.forEach((element, index) => {
       //   element.index = index + 1
       // });
-    },
+    },  
     goback () {
       this.$router.go(-1)
     },

+ 1 - 1
src/views/CombineManage/index.vue

@@ -68,7 +68,7 @@
                 </Select>
                 <Input v-model="item.scale"
                        :disabled='isCheck'
-                       style="width:80px">
+                       style="width:90px">
                 <span slot="append">%</span>
                 </Input>
                 <Icon @click="add(classInfo.detail)"

+ 1 - 0
src/views/PurchasingManage/InstockOrder/list.vue

@@ -235,6 +235,7 @@ export default {
       switch (type) {
         case 1:
         case 2:
+          this.handleGoPage(type, row.order_in_no)
         case 3:
           this.handleGoPage(type, row.order_in_no)
           break;

+ 2 - 2
src/views/PurchasingManage/QualitycontrolOrder/list.vue

@@ -28,7 +28,7 @@
                  style="width: 150px"
                  placeholder="项目名称" />
         </FormItem> -->
-        <FormItem label="紧急程度:">
+        <!-- <FormItem label="紧急程度:">
           <Select v-model="searchData.warning_state"
                   size="small"
                   clearable
@@ -38,7 +38,7 @@
                     :value="_item.id"
                     :label="_item.title"></Option>
           </Select>
-        </FormItem>
+        </FormItem> -->
         <FormItem label="业务员:">
           <Select v-model="searchData.man"
                   size="small"