检查leader bug

client/.env.development

@@ -2,8 +2,8 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://10.0.11.127:8000/api'
+# VUE_APP_BASE_API = 'http://10.0.11.127:8000/api'
-#VUE_APP_BASE_API = 'http://127.0.0.1:8000/api'
+VUE_APP_BASE_API = 'http://127.0.0.1:8000/api'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

client/src/views/qualityinspect/inspecttaskdo.vue

@@ -314,8 +314,8 @@ export default {
      //创建子任务
     async confirm(form) {
      
-      this.inspecttask.inspecttask=this.$route.params.inpecttask;
+      this.inspecttask.inspecttask=this.$route.params.id;
-      
+      console.log(this.inspecttask)
          createsubinspecttask(this.inspecttask).then((res) => {
              
                 this.dialogVisible = false;

client_mp/pages/inspectrecord/index.vue

@@ -160,7 +160,7 @@
 		},
 		onShow() {
 			this.getSubtaskDept();
-			this.getRecords()
+			this.getRecords();
 		},
 		methods: {
 			getSubtaskDept() {
@@ -202,7 +202,6 @@
 				}
 			},
 			sectionChange(index) {
-				console.log(index)
 				this.currentIndex = index;
 			},
 			sectionChange2(val){

client_mp/pages/login/login.vue

@@ -19,7 +19,7 @@
 			<u-button @click="submit" type="warning" >登录</u-button>
 			</view>
 			<view class="alternative">
-				<navigator url="login_password" class="password" open-type="redirect">密码登录</navigator>
+				<navigator url="login_password" class="password" open-type="navigate">密码登录</navigator>
 			</view>
 		</view>
 		<u-verification-code seconds="30" ref="uCode" @change="codeChange"></u-verification-code>
@@ -46,7 +46,7 @@
 export default {
 	data() {
 		return {
-			imageURL: 'http://testsearch.ctc.ac.cn:8000/media/default/banner3.jpg',
+			imageURL: '/static/banner3.jpg',
 			loginForm:{
 				mail:"",
 				msg:""

client_mp/pages/login/login_password.vue

@@ -24,7 +24,7 @@
 export default {
 	data() {
 		return {
-			imageURL: 'http://testsearch.ctc.ac.cn:8000/media/default/banner3.jpg',
+			imageURL: '/static/banner3.jpg',
 			loginForm:{
 				username:"",
 				password:""

client_mp/store/index.js

@@ -34,11 +34,11 @@ const store = new Vuex.Store({
 		vuex_user: lifeData.vuex_user ? lifeData.vuex_user : {},
 		vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '',
 		// vuex_host: 'http://127.0.0.1:8000',
-		// vuex_api: 'http://127.0.0.1:8000/api',
+		vuex_api: 'http://127.0.0.1:8000/api',
 		// vuex_apifile: 'http://127.0.0.1:8000/api/file/',
 		
 		vuex_host: 'https://testsearch.ctc.ac.cn',
-		vuex_api: 'https://testsearch.ctc.ac.cn/api',
+		//vuex_api: 'https://testsearch.ctc.ac.cn/api',
 		vuex_apifile: 'https://testsearch.ctc.ac.cn/api/file/',
 		
 		// 如果vuex_version无需保存到本地永久存储，无需lifeData.vuex_version方式

server/apps/quality/serializers.py

@@ -136,7 +136,11 @@ class InspectDeptSerializer(serializers.ModelSerializer):
         return queryset
     
     def get_leader(self, obj):
-        return InspectTeam.objects.filter(subtask=obj.subtask).first().member.pk
+        try:
+            pk = InspectTeam.objects.get(subtask=obj.subtask, type='组长').member.pk
+            return pk
+        except:
+            return None
 
 
 class InspectRecordCheckSerializer(serializers.ModelSerializer):