2
3
lining 6 роки тому
батько
коміт
c534256417

+ 1 - 1
src/dashoo.cn/backend/api/business/tmpzcgf/tmpzcgfSession.go

@@ -107,7 +107,7 @@ FROM
 func (s *TmpzcgtSession) InsertSupplierCert() error {
 	sql := "INSERT INTO OilSupplierCert (SupplierId,OutsideFlog, `Status` ,AccessCardNo,SupplierTypeName,InFlag,EffectStartTime,EffectEndTime,ApplyTime,Remark,CreateBy,GfID) " +
 		"SELECT -1 As SupplierId,企业名称 AS OutsideFlog,'8' As `Status`,准入证号 As AccessCardNo,准入类别 AS SupplierTypeName,准入标识 AS InFlag,有效期起 AS EffectStartTime,有效期止 AS EffectEndTime,年审日期 AS ApplyTime,备注 AS Remark,'导入' As CreateBy,ID " +
-		"FROM tmp_zcgf;"
+		"FROM tmp_zcgf WHERE 准入标识 != '取消' ;"
 	_, err := s.Session.Query(sql)
 	return err
 }

+ 11 - 11
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/goodsedit.vue

@@ -312,16 +312,16 @@
               </el-select>
             </el-form-item>
             <el-form-item label="专业处室">
-              <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
-                <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">-->
-              <!--</el-cascader>-->
-              <el-select  v-model="formData.majorDept"
-                          placeholder="请选择" style="width: 100%">
-                {{orgtreelist}}
-                <el-option  v-for="item in orgtreelist" :key="item.Id" :label="item.Fullname"
-                            :value="item.Id">
-                </el-option>
-              </el-select>
+              <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
+                style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">
+              </el-cascader>
+              <!--<el-select  v-model="formData.majorDept"-->
+                          <!--placeholder="请选择" style="width: 100%">-->
+                <!--{{orgtreelist}}-->
+                <!--<el-option  v-for="item in orgtreelist" :key="item.Id" :label="item.Fullname"-->
+                            <!--:value="item.Id">-->
+                <!--</el-option>-->
+              <!--</el-select>-->
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -736,7 +736,7 @@
         }
         api.getDictListByStatus(params, this.$axios).then(res => {
           this.dictData = res.data.items
-          this.orgtreelist = res.data.items['UnitOrgList'] //window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
+          this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name') // res.data.items['UnitOrgList'] //
           // this.auditerOptions = res.data.items['Auditer']
           // this.organizeOption = res.data.items['Organizes']
         }).catch(err => {