前后:合同是否分包的bug

src/dashoo.cn/backend/api/business/oilcontract/contract/contract.go

@@ -43,7 +43,7 @@ type OilContract struct {
 	ModifiedOn           time.Time `json:"ModifiedOn" xorm:"DATETIME 'ModifiedOn'"`
 	ModifiedUserId       int       `json:"ModifiedUserId" xorm:"INT(11) 'ModifiedUserId'"`
 	ModifiedBy           string    `json:"ModifiedBy" xorm:"default '1' VARCHAR(50) 'ModifiedBy'"`
-	SubPackage           int       `json:"SubPackage" xorm:"default 0 comment('是否分包') INT(11) 'SubPackage'"`
+	SubPackage           int       `json:"SubPackage" xorm:"default 0 comment('是否分包 0否 1是') INT(11) 'SubPackage'"`
 	ContractName         string    `json:"ContractName" xorm:"comment('合同名称') VARCHAR(500) 'ContractName'"`
 	ContractSonClass     string    `json:"ContractSonClass" xorm:"comment('合同子类') VARCHAR(500) 'ContractSonClass'"`
 	SmallClass           string    `json:"SmallClass" xorm:"comment('相应小类') VARCHAR(500) 'SmallClass'"`

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year-check/_opera/operation.vue

@@ -98,8 +98,8 @@
                 <el-col :span="8">
                   <el-form-item label="是否分包">
                     <el-select placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">
-                      <el-option key="1" label="是" value="1"></el-option>
-                      <el-option key="2" label="否" value="2"></el-option>
+                      <el-option :key="1" label="是" :value="1"></el-option>
+                      <el-option :key="0" label="否" :value="0"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year-single/_opera/operation.vue

@@ -102,8 +102,8 @@
                 <el-col :span="8">
                   <el-form-item label="是否分包">
                     <el-select placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">
-                      <el-option key="1" label="是" value="1"></el-option>
-                      <el-option key="2" label="否" value="2"></el-option>
+                      <el-option :key="1" label="是" :value="1"></el-option>
+                      <el-option :key="0" label="否" :value="0"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/_opera/operation.vue

@@ -97,8 +97,8 @@
                 <el-col :span="8">
                   <el-form-item label="是否分包">
                     <el-select placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">
-                      <el-option key="1" label="是" value="1"></el-option>
-                      <el-option key="2" label="否" value="2"></el-option>
+                      <el-option :key="1" label="是" :value="1"></el-option>
+                      <el-option :key="0" label="否" :value="0"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -127,8 +127,8 @@
         </el-tab-pane> -->
       </el-tabs>
     </el-card>
-    
-    
+
+
 
 
   </div>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods-year-check/_opera/operation.vue

@@ -98,8 +98,8 @@
                 <el-col :span="8">
                   <el-form-item label="是否分包">
                     <el-select placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">
-                      <el-option key="1" label="是" value="1"></el-option>
-                      <el-option key="2" label="否" value="2"></el-option>
+                      <el-option :key="1" label="是" :value="1"></el-option>
+                      <el-option :key="0" label="否" :value="0"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/_opera/operation.vue

@@ -97,8 +97,8 @@
                 <el-col :span="8">
                   <el-form-item label="是否分包">
                     <el-select placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">
-                      <el-option key="1" label="是" value="1"></el-option>
-                      <el-option key="2" label="否" value="2"></el-option>
+                      <el-option :key="1" label="是" :value="1"></el-option>
+                      <el-option :key="0" label="否" :value="0"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -127,8 +127,8 @@
         </el-tab-pane> -->
       </el-tabs>
     </el-card>
-    
-    
+
+
 
 
   </div>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-import/_opera/evaluate.vue

@@ -99,8 +99,8 @@
                 <el-col :span="8">
                   <el-form-item label="是否分包">
                     <el-select :disabled="disabled" placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">
-                      <el-option key="1" label="是" value="1"></el-option>
-                      <el-option key="2" label="否" value="2"></el-option>
+                      <el-option :key="1" label="是" :value="1"></el-option>
+                      <el-option :key="0" label="否" :value="0"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service/_opera/operation.vue

@@ -97,8 +97,8 @@
                 <el-col :span="8">
                   <el-form-item label="是否分包">
                     <el-select placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">
-                      <el-option key="1" label="是" value="1"></el-option>
-                      <el-option key="2" label="否" value="2"></el-option>
+                      <el-option :key="1" label="是" :value="1"></el-option>
+                      <el-option :key="0" label="否" :value="0"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -127,8 +127,8 @@
         </el-tab-pane> -->
       </el-tabs>
     </el-card>
-    
-    
+
+
 
 
   </div>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-work-order/_opera/operation.vue

@@ -93,9 +93,10 @@
 
                 <el-col :span="8">
                   <el-form-item label="是否分包">
+                    <!-- SubPackage -->
                     <el-select :disabled="formDisabled"  placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">
-                      <el-option key="1" label="是" value="1"></el-option>
-                      <el-option key="2" label="否" value="2"></el-option>
+                      <el-option :key="1" label="是" :value="1"></el-option>
+                      <el-option :key="0" label="否" :value="0"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -212,7 +213,7 @@
       title="完成工单"
       :visible.sync="issueVisible"
       width="50%">
-        <div style="width: 100%;display: flex;justify-content: center;height: ;">
+        <div style="width: 100%;display: flex;justify-content: center;">
           <el-form :inline="true" ref="issueFrom" :model="issueFrom" class="demo-form-inline " :rules="issueRules">
 
             <el-form-item label="选择评价"  prop="region">